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