Update to latest sprint.
Merge branch 'develop' of https://github.com/Apelon-VA/ISAAC-Archetypes into develop

Conflicts:
	admin/src/main/resources/bin/generateVha.bat
	admin/src/main/resources/bin/generateVhaCimi.bat
	admin/src/main/resources/bin/template.bat
	pa-archetype/src/test/resources/projects/basic/archetype.properties