sdsds
Merge branch 'master' of
https://github.com/c0mpas/MobileAppDevelopment.git

Conflicts:
	MADA_ueb05/res/layout/activity_conf_alarm.xml
	MADA_ueb05/res/values/strings.xml