Merge branch 'master' of https://github.com/boskee/Minecraft

Conflicts:
	gui.py
Merge branch 'master' of git://github.com/BertrandBordage/Minecraft