modified:   log/gate.log
	modified:   src/mysql_module/mysql/mysql.erl
	modified:   src/mysql_module/mysql/mysql_client.erl
	modified:   src/util_tools/util.erl
Merge branch 'master' of https://github.com/EricYT/zhougame

Conflicts:
	src/mysql_module/mysql/mysql.erl
	src/util_tools/util.erl

	modified:   ProjectPlans
	modified:   options/designer.option
	modified:   src/mysql_module/mysql/mysql.erl
	modified:   src/mysql_module/mysql/mysql_util.erl
	modified:   src/util_tools/node_util.erl
	modified:   src/util_tools/util.erl