again and again and again
Merge branch 'master' of github.com:dopedi/LV-Master3000

Conflicts:
	LV-Master3000Test/src/student/tugraz/at/lv_master3000/test/ExamTest.java