commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.cache
	bin/JukugoQuiz.apk
	bin/classes.dex
	bin/resources.ap_
	libs/scala_library.min.jar
	proguard_cache/cache.data
	proguard_cache/proguard_processed.conf