make PropertyValues prettier
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git

Conflicts:
	POS/build.xml
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git

Conflicts:
	POS/build.xml
push build