levelgear update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_level_select.xml
levelgear update