[~BUGFIX] Hide markdown in email editor when it is disabled
Remove shortened array syntax (PHP 5.4 feature)
Merge pull request #27 from Gibbs/hotfix-2.1.0

Remove shortened array syntax (PHP 5.4 feature)
Tiny update of EpicEditor
Update marked.js to version v0.3.2
Update reMarked.js to latest version which fixes a lot of bugs
Tiny update of beautify-html.js (AMD)
Update highlight.js to version 8.0 http://highlightjs.org; new themes
Update readme for version 2.1.1
Merge branch 'develop'

* develop:
  Update readme for version 2.1.1
  Update highlight.js to version 8.0 http://highlightjs.org; new themes
  Tiny update of beautify-html.js (AMD)
  Update reMarked.js to latest version which fixes a lot of bugs
  Update marked.js to version v0.3.2
  Tiny update of EpicEditor
  Remove shortened array syntax (PHP 5.4 feature)
  [~BUGFIX] Hide markdown in email editor when it is disabled