Update POM
Wording changes

Conflicts:
	src/main/webapp/app/internationalization.js
Fix Maven Sonar configuration
Merge branch '2.0'