Added uri and prefix fields in vocabulary model, small fixes in templates.
Merge branch 'master' of https://github.com/LinDA-tools/vocabularyrepo

Conflicts:
	linda/linda.db
	linda/linda/models.py
	linda/linda/static/css/style.css
	linda/linda/templates/index.html
	linda/linda/templates/util/header.html
	linda/linda/urls.py
	linda/linda/views.py
Fixes in templates from broken template language directives.