Products page service
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.js
	app/index.html
	app/js/controllers.js
	bower.json
Products page service