Merge branch 'master' into 603-sorting-method

# Conflicts:
#	app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/AbstractNotesDatabase.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
#	app/src/main/res/layout/activity_notes_list_view.xml
#	app/src/main/res/menu/menu_list_view.xml