update
Merge branch 'master' of https://github.com/zeemanliao/webgame

Conflicts:
	lib/obj/battle.js
	lib/obj/battleDataBase.js
	lib/obj/skill.js
update