new commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	.idea/libraries/ComAndroidSupportAppcompatV71900_aar.xml
	.idea/misc.xml
	MapSpot/MapSpot.iml