SaltWaterFish-20130520-23:50
Merge https://github.com/hughsons/saltwaterfish

Conflicts:
	templates/myaccount.html
	templates/wishlist.html
	templates/wishlistitems.html
SaltWaterFish 2013-05-23 23:50