WIP: For demo on 5-6-14
Merge branch 'devel-practice-copy' into devel-practice-demo5-14

Conflicts:
	ui/public/workspace/js/addtag.js
Final changes for demo on 5-6-14