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

# Conflicts:
#	src/main/java/com/owncloud/android/utils/DisplayUtils.java