Merge branch 'master' of github.com:demisx/angular-phonecat-components

Conflicts:
	README.md