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

# Conflicts:
#	app/src/main/java/com/drdisagree/iconify/ui/activities/VolumePanel.java