Repo tidy
Merge branch 'master' into angular

Conflicts:
	.gitignore