Various changes.
Merge branch 'master' of github.com:mondora/mnd-website