Changed make-upsert in add-other to make-dao. Upsert not needed.
uuids everywhere
Merge branch 'uuid' of github.com:nubgames/prom into uuid