Import sorting
Merge branch 'master' of github.com:slipstream/SlipStreamClient