semantic & metadata fixes
Merge branch 'develop' of https://github.com/olab/Open-Labyrinth into develop

Conflicts:
	www/application/views/vocabulary/info.php