Huge settings fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/xml/preferences.xml
	src/live/wallpaper/Configs/Preference/FloatValuePreference.java