[AM] delete function
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/ChooseStartConfigurationActivity$2.class

	StudyProgress/bin/classes/com/studyprogress/ChooseStartConfigurationActivity.class
	StudyProgress/bin/classes/com/studyprogress/MainActivity$1.class
	StudyProgress/bin/classes/com/studyprogress/MainActivity$2.class
	StudyProgress/bin/classes/com/studyprogress/MainActivity.class
	StudyProgress/bin/resources.ap_