Merge branch 'master' of code.jd.com:7630420631/jae_micromood

Conflicts:
	README.md
	pom.xml
	src/main/java/org/dy66/MicroMood/Controller/Admin.java
	src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of github.com:kingdawnyoung/micromood

Conflicts:
	README.md
	pom.xml
	src/main/java/org/dy66/MicroMood/Controller/Admin.java