giavacms with new common-base, common-web, common-jpa
Merge remote-tracking branch 'upstream/master'