Proj properties
Merge branch 'master' of https://github.com/JohnAdamsy/UPID

Conflicts:
	.project