Update
Merge branch 'master' of https://github.com/rsteinberger/angular

Conflicts:
	README.md