properties changed
Merge branch 'master' of
https://github.com/AppRevelations/MyParkingPlace/

Conflicts:
	project.properties