Nothing really changed. Commit for the sake of merge.
This will all be being rebuilt anyways...
Merge branch 'development' of https://github.com/DComm2013Network/Server into development