CK Implemented Map Fragment
Merge branch 'master' of https://github.com/pichangetheworld/GPSocial-android

Conflicts:
	project.properties