update js file locations
fix merge conflicts
Merge branch 'dbstaging' of https://github.com/achamely/omniwallet into dbstaging