commiting properties
Merge remote-tracking branch 'origin/Hink' into Hink

Conflicts:
	Hinkling/project.properties