Updated formats, naming conventions
Updated project properties
Resorting to ant build for expediency
added deprecated source (needed for archive) to gitignore
Corrected merging error in gitignore
Merge branch 'wip/rest'

Conflicts:
	.gitignore
added maven target to gitignore (again)
Merge branch 'master' into dev/main

Conflicts:
	.gitignore