made bogus change
AMerge branch 'recover3'

Conflicts:
	app/www/templates/gift-detail.html
Added old wishlist functionality back