Merge branch 'master' of https://zektbach@github.com/sperkbird/EnokiServer.git into database
Usercontrol & Systemswitch & Catswirch edit
Merge branch 'database' into system