Added sonatype
Merge branch 'master' into base_demo

Conflicts:
	webapp/pom.xml