angular
Merge branch 'master' into feature-angular-seed

Conflicts:
	.gitignore