Merge branch 'master' into 354-password-protection

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/AboutActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/ExceptionActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/PreferencesActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java
#	app/src/main/java/it/niedermann/owncloud/notes/util/Notes.java