Cleanup on aisle Connection
Merge branch 'connection' into dev
Merge branch 'dev' of https://github.com/darkaeon10/boxdrive into dev