Merge remote-tracking branch 'origin/notifications' into notifications

# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java