merging in serge
Merge branch 'master' of https://github.com/isaiahmathieu/pocketpickup

Conflicts:
	PocketPickup/project.properties