added form logic
Merge branch 'master' of github.com:jmeetsma/Iglu-Common