asdsadsd
Merge branch 'master' of https://github.com/OnTheSpotTeam/OnTheSpot1.git

Conflicts:
	project.properties