Merge remote-tracking branch 'origin/enhance-category-handling' into enhance-category-handling

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