Merge remote-tracking branch 'origin/master' into refresh-preview

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java
#	app/src/main/res/layout/activity_single_note.xml