Integrate backend and frontend into master