。。。
Merge remote-tracking branch 'origin/master'

Conflicts:

	TeamWolf/src/main/java/TeamWolf/TeamWolf/client/BL/applicationBL/ApplicationBL.java