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

# Conflicts:
#	app/src/main/java/com/drdisagree/iconify/utils/compiler/MonetCompiler.java
#	app/src/main/java/com/drdisagree/iconify/utils/compiler/OnBoardingCompiler.java
#	app/src/main/java/com/drdisagree/iconify/utils/compiler/OnDemandCompiler.java
#	app/src/main/java/com/drdisagree/iconify/utils/compiler/QsMarginCompiler.java
#	app/src/main/java/com/drdisagree/iconify/utils/compiler/QsTileHeightCompiler.java
#	app/src/main/java/com/drdisagree/iconify/utils/compiler/RoundnessCompiler.java
#	app/src/main/java/com/drdisagree/iconify/utils/compiler/SettingsIconsCompiler.java
#	app/src/main/java/com/drdisagree/iconify/utils/compiler/SwitchCompiler.java
#	app/src/main/java/com/drdisagree/iconify/utils/compiler/VolumeCompiler.java