Adding tags to notes
Adding tags moved to separate .html and .js files
Merge branch 'feature/tags' into develop

Conflicts:
	website/app/views/VideoController/video.html