Fixing an unresolved merge conflict in ProjectService
Package.json fix
Fixing a small bug I found in ImportExporting
Moved register user to db panel in admin
 fixed merge conflicts pulling master into edit point images