Merge pull request #1 from MBPS-Project/testserver-mb

Testserver mb
working version
Merge branch 'testserver' of https://github.com/MBPS-Project/mbps_server.git into testserver
new json mapper
Removed unused imports.
Merge pull request #2 from MBPS-Project/testserver

Testserver