23333
Merge remote-tracking branch 'origin/master'

Conflicts:
	designfile/charactor/char034/Backup/20140906 193921/char033.json
	designfile/charactor/char034/Backup/20140909 175250/char034.json
	designfile/charactor/char034/Backup/20140910 102145/char034.json
	designfile/charactor/char034/Backup/20140910 120016/char034.json
	designfile/charactor/char034/Backup/20140910 120516/char034.json
	designfile/charactor/char034/Backup/20140910 121016/char034.json
	designfile/charactor/char034/Backup/NormalCloseTag.xml