cart step 3 & 4
Merge branch 'development' of https://github.com/thebookofeveryone/website into development

Conflicts:
	inc/cart.php