add better exclude for angular template files
Update package.json
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	package.json