23333
Merge branch 'master' of github.com:maramail/gogogo

Conflicts:
	designfile/charactor/char034/Backup/NormalCloseTag.xml