Merge branch 'master' of github.com:101companies/101simplejava

Conflicts:
	contributions/jaxbComposition/build.gradle
Merge branch 'master' of github.com:101companies/101simplejava