Merge remote-tracking branch 'origin/sandeepBranch' into sandeepBranch

# Conflicts:
#	src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java
#	src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.java
#	src/main/java/com/owncloud/android/utils/theme/ThemeCheckableUtils.java