merged with frontend
Minor refactoring
Updated dependencies
Merged backend to master
Fixed merge conflicts