[AM] bug fix
Merge branch 'master' of https://github.com/AndrejMueller01/sw14_free_06

Conflicts:
	StudyProgress/bin/StudyProgress.apk
	StudyProgress/bin/classes.dex
	StudyProgress/bin/classes/com/studyprogress/MainActivity.class