working on save tag
uuuuhh

Conflicts:
	master/js/main.js
all this stuff
aoeu
Merge branch 'master' of https://github.com/theguice/iolab-controlled-vocabularies