?
Merge branch 'master' of https://github.com/wuggi/softwareengineering
?
Conflicts:
	actionbar/bin/android-actionbar-library.jar
	numpicker/bin/library.jar
Alarm robuster