Explicitly assigns cardinality to forms for activities
Merge branch 'version3' of github.com:bedatadriven/activityinfo into version3