delete minecraft, clear all
Merge old develop branch and modify things
Merge branch 'master' into develop

Conflicts:
	settings.py
merge things, all done