Forget to update grass pass 2 sun location
Misc tweaks, mainly to include new island tracks in challenges and GPs, and other minor fixes
Merge branch 'master' into 0.8.2-beta