Google maps!
Merge branch 'master' of https://github.com/Valian/MeetMe

Conflicts:
	MeetMe/project.properties
	MeetMe/res/values/strings.xml
Wielki (bolesny) merge actionbara i mapki :)