Merge branch 'dev' into multiple_servers
Merge branch 'multiple_servers' of https://github.com/darkaeon10/boxdrive into multiple_servers