Fix wrong uri to assets on backend
Merge remote-tracking branch 'origin/refactor' into refactor