popovertest
Merge branch 'master' of https://github.com/e-cloud/angular-phonecat

Conflicts:
	.bowerrc
	bower.json