Preparing pull request

- Cleaning the branch from all unstable modules
- Fixed includes in NetworkServer/main.cpp