Merge branch 'gh-pages'
Made x3 the default, maintenance, and new spawnsys
Merge branch 'master' into gh-pages