change denomination "form" to "pagetype"
Merge branch 'master' of https://github.com/aquaverde/aquarius-core