Added categorization of annotations.
Scroll.
Merge branch 'master' of https://github.com/guerre50/VionLabsHack

Conflicts:
	public/css/desktop.css
	public/js/app/templates/annotation.html
	public/js/app/templates/dict.html
	public/js/app/views/AnnotationView.js
	public/js/app/views/DictView.js
	public/js/app/views/StudyView.js

Final countdown.