new tag layout
Merge branch 'master' of https://github.com/weindex/weindex.ca

Conflicts:
	weindex.web/src/main/webapp/WEB-INF/vm/label/index.vm