[AM] Delete Function, Refactoring
Merge branch 'master' of https://github.com/AndrejMueller01/sw14_free_06

Conflicts:
	StudyProgress/bin/AndroidManifest.xml
	StudyProgress/bin/R.txt
	StudyProgress/bin/StudyProgress.apk
	StudyProgress/bin/classes.dex
	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/ChooseExistingOrNewCurriculum.class

	StudyProgress/bin/classes/com/studyprogress/ChooseStartConfigurationActivity.class
	StudyProgress/bin/classes/com/studyprogress/CreateNewCurriculum.class
	StudyProgress/bin/classes/com/studyprogress/CreateOptionalCourses.class

	StudyProgress/bin/classes/com/studyprogress/CurriculumListViewActivity.class
	StudyProgress/bin/classes/com/studyprogress/MainActivity$2.class
	StudyProgress/bin/classes/com/studyprogress/MainActivity.class

	StudyProgress/bin/classes/com/studyprogress/adapter/CourseListAdapter.class
	StudyProgress/bin/resources.ap_
	StudyProgress/gen/com/example/studyprogress/R.java