no message
no message
Merge branch 'master' of https://github.com/kofall/dafeiji

Conflicts:
	project/Resources/close1.png
	project/Resources/close2.png