Merge branch 'master' of gburri.org:minecraft_web into master