theme 4 and 5
Merge remote-tracking branch 'origin/master'

Conflicts:

	app/src/main/java/com/si5/camash/fruityco/ui/activities/GameActivity.java