modify main.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	android_client/SocialMap/res/layout/main.xml
Merge branch 'master' of https://github.com/sadupa/social-map