Server: Main renamed to oldMain, Controlpanel updated + renamed to Main.
Merge branch 'master' of github.com:GRAAFYME/ContainingJ2P2P