Added text support in xform.
Merge branch 'version4' of https://github.com/bedatadriven/activityinfo into version4
Merge remote-tracking branch 'origin/version4' into version4