Merge branch 'master' of github.com:victorporof/Sublime-JavaScript-ES.next

Conflicts:
	ES.next.tmLanguage
Merge branch 'master' of github.com:victorporof/Sublime-JavaScript-ES.next

Conflicts:
	ES.next.tmLanguage