Cleanup
Merge branch 'shipsync-v5' of https://github.com/five23/shipsync-community into shipsync-v5