Working on webinterface and API Server
Manual merge
Manual merge and added ember debug statements
Merge branch 'master' of github.com:OccupOS/OccupOS