12/11
Merge branch 'master' of https://github.com/eastflag/GmpStudy.git

Conflicts:
	GmpStudy/AndroidManifest.xml
	GmpStudy/res/layout/activity_main.xml
	GmpStudy/res/layout/datepicker.xml
	GmpStudy/src/com/eastflag/app/MainActivity.java