Merge remote-tracking branch 'geomajas/master'
Merge remote-tracking branch 'geomajas/master'
GJP-37 updated parent version
Merge pull request #42 from kurohyou/GJP-37-Update-geomajas-parent-version

Gjp-37 update geomajas parent version