use scaffolding version 2.1.2
update hibernate4 plugin version in assemble.gradle
Merge branch '2.4.x'