commit
Merge branch 'master' of https://github.com/guivuikiong/iyiqifei

# By weijunhui
# Via weijunhui
* 'master' of https://github.com/guivuikiong/iyiqifei:
  后台BUG修复

Conflicts:
	iyiqifei/src/main/java/com/guivuikiong/iyiqifei/controller/ActivityController.scala
	iyiqifei/src/main/java/com/guivuikiong/iyiqifei/controller/PathController.scala