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

Conflicts:
	MADA_ueb01/res/drawable-xhdpi/ic_launcher.png