Add project.properties to gitignore
Merge branch 'dev' of https://github.com/waaghals/Unique-Lone-Dog into dev

Conflicts:
	nbproject/project.properties