refactor and cleanup
Merge branch 'develop' of github.com:studgent/android into develop

Conflicts:
	src/be/ugent/oomo/groep12/studgent/activity/QuizActivity.java