Re-added license, scm, project... metadata to pom.
Merge branch 'master' into dev