积分变更
Merge branch 'ito' of https://github.com/liqian008/geekway.git into ito

Conflicts:
	geekway-front/src/main/java/com/bruce/geekway/controller/klh/KlhUserController.java
	geekway-service/src/main/java/com/bruce/geekway/dao/impl/klh/KlhUserScoreLogDaoImpl.java
	geekway-service/src/main/java/com/bruce/geekway/service/impl/klh/KlhDailySignServiceImpl.java
	geekway-service/src/main/java/com/bruce/geekway/service/impl/klh/KlhUserProfileServiceImpl.java
	geekway-service/src/main/resources/generatorConfig4java.xml