integrated with AngularJS sublime package
Merge remote-tracking branch 'origin/master'

Conflicts:
	javascript/class creation.sublime-snippet
	javascript/promise handlers.sublime-snippet