Initial Commit
Updates for SCM
Merge branch 'master' into development

Conflicts:
	pom.xml
	src/main/resources/db-master-data.xml
	src/main/resources/db-master.xml