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

Conflicts:
	game_manage.cc
	main.cc
Merge pull request #4 from lbird1992/shenyangzyp-master

Shenyangzyp master