Térkép
Merge branch 'master' of
https://github.com/toroktibor/partyappandroid.git

Conflicts:
	src/hu/schonherz/y2014/partyappandroid/activities/ClubsMapFragment.java
Merge branch 'master' of https://github.com/toroktibor/partyappandroid.git