Some tweaks for the 1.2.0 release.
Another attempt to do a release.
Merge branch 'master' of https://github.com/thiagohp/parent

Conflicts:
	pom.xml