We have issues with getting the product/attributes API to work.
Merge branch 'master' of https://github.com/KongBong/Systemudvikling

Conflicts:
	index.html
	js/controllers.js
	js/main.js
	partials/frontpage.html
	partials/search.html
Problems with product/attributes