Add support for Roboconf
Using `variants` for Python def/class constructs.
update function class
Merge branch 'master' of github.com:vincent-zurczak/highlight.js into vincent-zurczak-master

Conflicts:
	AUTHORS.en.txt
markup tests for AspectJ:

intertype method
intertype constructor
trim spaces
hotfix
Add markup test for nested comments
Add markup test for the infix keyword
Merge branch 'test/haskell'
Merge pull request #616 from ozlerhakan/master

Update the function class
Merge branch 'master' of github.com:isagalaev/highlight.js
Normalied ending new-line in AspectJ markup tests.
Merge branch 'vincent-zurczak-master'
Merge remote-tracking branch 'isagalaev/master'
Remove tabs for two spaces
Change double quotes to single
Change mizar keyword definition to one string

This is mostly for consistency reasons, but it there is also compression
hinting. With this change uglify can simple turn it into one long string.
Remove execute file permissions
Change file format of oxygene to unix