First draft of new design
Merge branch 'refs/heads/entwine_develop_heydecke' into feature/new_design

Conflicts:
	style/annotations/annotate.less
	style/annotations/list.less
	style/annotations/style.less
	style/style.css
	templates/list-annotation.tmpl
Fixed closing brackets
Fixed nesting
CSS Fixes
Merge branch 'refs/heads/entwine_develop' into feature/new_design_temp

Conflicts:
	index.html
	style/annotations/list.less
	style/style.css
	templates/list-annotation.tmpl
Yet another design revision
Merge branch 'refs/heads/entwine_develop' into feature/new_design

Conflicts:
	style/annotations/annotate.less
	style/annotations/style.less
	style/style.css
	templates/annotate-category.tmpl
	templates/comment.tmpl
First working version of new design (kind of :-))
Merge branch 'refs/heads/entwine_develop' into feature/new_design
Fixed some minor CSS Issues for Chrome and Safari
Merge branch 'refs/heads/entwine_develop' into feature/new_design
New color palette and improved list design.
First release candidate for new design
Fix for scaling in Chrome
Fixed resizing of textareas in list
Merge branch 'feature/new_design' into develop