update 2014-12-8
Merge branch 'dev' of github.com:yyx19870914/EndlessWorld into dev

Conflicts:
	game-server/models/Skill.js