Added maven enforcer plugin to ensure uniquely versioned dependencies during the build
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml