HTML layout changes for sortable list views + temp styling.
Moved SyntaxHighlighter scss file.
Apparently Git didn't actually add the file..
Merge branch 's3-sortlists' of https://github.com/arkon94/Markus into arkon-s3-sortlists

Conflicts:
	app/assets/stylesheets/main.scss
	app/views/annotation_categories/index.html.erb
	app/views/flexible_criteria/index.html.erb
	app/views/results/edit.html.erb
	app/views/results/view_marks.html.erb
	app/views/rubrics/_boot.js.erb
	app/views/rubrics/index.html.erb