Correction conflicts
Merge branch 'integration' of https://github.com/ThunderFox/Space-Rider into integration