Merge branch 'hotfix/imagemap-coords'
Merge branch 'release/sprint-30'
Merge branch 'release/sprint-30' into dev
Merge branch 'release/sprint-30'
Merge branch 'master' of brie:/srv/www/uft.claudinechionh.net/htdocs
contrib module updates: context, feeds_tamper
Update Events feature from live site.
Update Handbook feature from live site.
Update Units feature from live site.
field_permissions module
Add fields for unit approvals.
Merge branch 'feature/unit-approvals' into dev
Merge branch 'feature/unit-approvals' into dev
Update contrib modules: conditional_fields, features.
Merge branch 'dev' of brie:/srv/www/uft.claudinechionh.net/htdocs into dev
Changes for Sprint 34
Merge branch 'release/sprint-34'
Merge branch 'release/sprint-34' into dev
Update Courses feature from live site.
Update Users feature from live site.