bug theme 3 + theme 6
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/si5/camash/fruityco/ui/fragments/Theme2.java