update
Merge remote-tracking branch 'origin/master'

Conflicts:
	jnt/base/jnt-tree-web/src/main/java/com/jnt/tree/web/controller/PlayerController.java
update