Syntax highlighting works in revision view
Merge remote-tracking branch 'origin/master' into highlighting

Conflicts:
	client/js/controllers.js
Working again