update no mocks
Merge branch 'mock' of github.com:CampusPI/Server into mock
up no mocks