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

Conflicts:
	StudyProgress/bin/StudyProgress.apk
	StudyProgress/bin/classes.dex
	StudyProgress/bin/classes/com/example/studyprogress/R$color.class
	StudyProgress/bin/classes/com/example/studyprogress/R$dimen.class
	StudyProgress/bin/classes/com/example/studyprogress/R$drawable.class
	StudyProgress/bin/classes/com/example/studyprogress/R$id.class
	StudyProgress/bin/classes/com/example/studyprogress/R$layout.class
	StudyProgress/bin/classes/com/example/studyprogress/R$menu.class
	StudyProgress/bin/classes/com/example/studyprogress/R$raw.class
	StudyProgress/bin/classes/com/example/studyprogress/R$string.class
	StudyProgress/bin/classes/com/example/studyprogress/R$style.class
	StudyProgress/bin/classes/com/studyprogress/SplashScreenActivity.class
	StudyProgress/bin/resources.ap_
	StudyProgress/gen/com/example/studyprogress/R.java
	StudyProgressGUITest/bin/StudyProgressGUITest.apk
	StudyProgressGUITest/bin/classes.dex