Merge remote-tracking branch 'origin/sync-worker' into sync-worker

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncWorker.java