Version 0.2.1
Merge branch 'master' of https://github.com/shenyangzyp/Dream into shenyangzyp-master

Conflicts:
	game_manage.cc
	main.cc