Updated JSON-Server and Login/Register
Merge branch 'frontend' of https://github.com/BarnBay/master.git into frontend