add haxe support
add haxe example to test.html
remove redundant feature
add hx alias
add preprocessor keywords
basic Gradle support added
Added Nimrod support
Add class reference
Add self to authors list
Add TypeScript support
add hybrid style
skip highlighting name of named rest parameter
Merge pull request #487 from nicwest/hybrid-theme

Add hybrid style
Add Nic West to changelog
Add Nic West to contibutors
Merge remote-tracking branch 'panuhorsmalahti/master'

Conflicts:
	AUTHORS.en.txt
Merge remote-tracking branch 'flaviut/master'

Conflicts:
	AUTHORS.en.txt
Update languages and styles contribution guides
Merge remote-tracking branch 'chester1000/master'

Conflicts:
	AUTHORS.en.txt
	src/test.html
Merge fixed, gradle keyword typo fixed