Activate web-mode
Merge branch 'hotfix/web-mode-2014-05-30-11-04'