no cmnt
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering

Conflicts:
	bin/classes/com/example/swetest/MainActivity.class
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering
SetAlarms.class : time is set with ok, but destroyed instantly
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering
Merge branch 'master' of https://github.com/gollabaer/SoftewareEngineering
MERGE