Map is working.
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Map Marker changed
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	app/src/main/res/values/strings.xml