Fix for FEND-979
Revert to e2ef785
Fixing messaging for FEND-979
Merge branch 'master' into dev/FEND-979
Merge branch 'master' into dev/FEND-979
Removing seemingly not needed dependency for the maven tomcat plugin
Merge branch 'master' into dev/FEND-979
Instead of removing dependencies, lets try forcing a refresh
Removing dependency purge plugin
A kludge for FEND-979
merge conflict resolution with pom
changed pom project version to release version
Merge branch 'master' of github.com:PLOS/ambra-admin
Merge branch 'master' into dev/FEND-901

Conflicts:
	pom.xml