Add support for Roboconf
Merge branch 'master' of github.com:vincent-zurczak/highlight.js into vincent-zurczak-master

Conflicts:
	AUTHORS.en.txt
Merge branch 'vincent-zurczak-master'
Merge remote-tracking branch 'isagalaev/master'