LZ
Merge branch 'master' of https://github.com/GodsFavorite/OurProject

Conflicts:
	WebRoot/WEB-INF/classes/com/crazy/dao/HomeadvertisementDAO.class
	WebRoot/WEB-INF/classes/com/crazy/service/admin/AdminLoginService.class
	src/com/crazy/dao/HomeadvertisementDAO.java
	src/com/crazy/service/admin/AdminLoginService.java