added Prism.js
those colours were getting annoying
Merge branch 'merge' into new_style

Conflicts:
	public/css/less/hcf-style.less