Merge commit
Merge branch 'master' of https://github.com/chemo/ImmunologySpring.git

Conflicts:
	Immunology/src/main/java/com/immunology/logic/dao/DrugDao.java
	Immunology/src/main/java/com/immunology/logic/dao/impl/DrugDaoImp.java
	Immunology/src/main/java/com/immunology/logic/service/StatisticService.java
	Immunology/src/main/java/com/immunology/logic/service/impl/StatisticServiceImpl.java
	Immunology/src/main/resources/js/statistic.js
	Immunology/src/main/webapp/WEB-INF/pages/user/components/analytic-charts.jsp