added favourite products functionality
Merge branch 'master' of https://github.com/stevebosworth/beer_me

Conflicts:
	.DS_Store
	app/index.html
	app/scripts/controllers/main.js