merging master
merge
adding item to cart now redirects to that items store
implement hstore on items, items show page now dynamically generates from options column in item table
re-add hidden field for item id on item show page
merge ian-branch