Apostrophe fix + tabs fix
Merge apostrophe string fix from 'feature-gherkin' of github.com:matteofigus/highlight.js into gherkin

Conflicts:
	src/languages/gherkin.js
Merge branch 'gherkin'