add support for custom question groups and layouts
improve error message
Merge branch 'master' of github.com:Dexels/navajo
re-enable xdomain protection