Merge branch 'master' of https://github.com/fxbois/web-mode

Conflicts:
web-mode.el
Merge branch 'master' of https://github.com/fxbois/web-mode

Conflicts:
	web-mode.el
fix
fix element-rename
new version
razor fixes
underscore fix
underscore new fix
fixes
razor fixes