-
Merge branch 'master' of
https://github.com/toroktibor/partyappandroid.git

Conflicts:
	project.properties
bugfixek
asd
Merge branch 'master' of https://github.com/toroktibor/partyappandroid.git