AI-625 Ensured that new forms are created in the resource store.
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4