Small changes
Shtorm removed
Merge branch 'server-development'
Shtorm debugging