test
Merge branch 'master' of https://github.com/minardi/SSTTv2-server
edit device ^^
Merge branch 'master' of https://github.com/minardi/SSTTv2-server