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

Conflicts:
	MADA_ueb03/src/com/example/mada_ueb03/SettingsActivity.java