Updated to match master
Merge branch 'gh-pages' of https://github.com/thiecec/civcraftsite into gh-pages