Add term/label mappings to term panel.
Merge remote-tracking branch 'fenriswolf/master' into new_branch

Conflicts:
	src/app/panels/terms/module.js