Merge branch 'origin/dev'
Merge branch 'origin/dev'
latest work
Merge branch 'origin/dev'
Merge branch 'origin/dev'
latest changes
Merge remote-tracking branch 'origin/dev' into jk-work-03-17
latest
Merge branch 'dev' into jk-work-03-17

Conflicts:
	moo/scripts/coffee/activity-types-lib.coffee
	moo/scripts/coffee/workflowbuilder.coffee
	moo/scripts/config.js
	moo/scripts/js/mylibs/activity-types-lib.js
	moo/scripts/js/mylibs/activity-types-lib.map
	moo/scripts/js/mylibs/workflowbuilder.js
	moo/scripts/js/mylibs/workflowbuilder.map
	moo/workflowbuilder.html
Merge branch 'jk-work-03-17' into dev