Explicitly deleted copy and move constructors
Changed the name of the client's main class
Merge branch 'dev' into dev-map
Changed the name of the editor's main class