fix merge con
Merge pull request #7 from autumnfjeld/inhouselogin

fix merge con
working on delete
test
using uid for user database key
updated use of auth.user.id
Merge pull request #8 from autumnfjeld/userkey

Userkey
Merge pull request #9 from davidmansy/feature

Adds qty, original price, deal price, merchant name to deal
Merge pull request #10 from davidmansy/feature

Last version with showing the deals only with end time > now()
Fix merchantdata service