Added flickr icon, updated twitter icon
added crop hierarchy basics
Fix "km miles of" typo.
Merge pull request #202 from Skud/social-icons

Added flickr icon, updated twitter icon
Merge pull request #205 from pozorvlak/km_miles

Fix "km miles of" typo.
moved the update_order method from product to member
show account status/upgrade button in various places
Merge pull request #203 from Skud/crop-hierarchy

added crop hierarchy basics
Merge branch 'dev' into payments-new

Conflicts:
	db/schema.rb
Don't display shop if they already have a paid account

This works fine in reality, but we can't figure out how to write tests
for it.  For some reason the @member object, which passes a test for
is_paid?, doesn't get recognised as such when it's passed through to the
view itself. Help?
don't allow multiple order items per order
remove unneeded edit/new actions from order_item
fixed bug with non-int prices

now if you choose to pay 33.33 it doesn't round to 33.00
also removed PUT and DELETE actions from order items
(we don't want them for now, can reinstate later if/when we do.)