Cleanup #time 30m
- fixed some merging bugs in satellites
Merge branch 'master' of github.com:yourdelivery/JigMagga