...
Merge branch 'master' of https://github.com/garagepoort/Android

Conflicts:
	AlarmAndroidClient/.classpath
	AlarmAndroidClient/bin/AlarmAndroidClient.apk
	AlarmAndroidClient/bin/classes.dex
	AlarmAndroidClient/bin/classes/be/cegeka/alarms/android/client/activities/InfoActivity.class
	AlarmAndroidClient/bin/resources.ap_
	AlarmAndroidClientRobotiumTest/.classpath
	AlarmAndroidClientRobotiumTest/bin/AlarmAndroidClientRobotiumTest.apk
	AlarmAndroidClientRobotiumTest/bin/classes.dex
	AlarmAndroidClientRobotiumTest/bin/classes/be/cegeka/alarms/android/client/test/InfoActivityTest.class
	AlarmAndroidClientRobotiumTest/bin/resources.ap_
	AlarmAndroidClientRobotiumTest/src/be/cegeka/alarms/android/client/test/InfoActivityTest.java