fixed merge conflicts with upstream/master, added support of comments in html and js files
Merge branch 'support-comments' of github.com:alimehdi92/angular-gettext-tools into support-comments

Conflicts:
	lib/extract.js