Merge branch 'master' of https://github.com/cloudsharl/crawler

Conflicts:
	crawler-web/src/main/java/com/zxsoft/crawler/web/controller/user/LoginController.java
	crawler-web/src/main/java/com/zxsoft/crawler/web/controller/website/SectionController.java
	crawler-web/src/main/resources/springMVC.xml
	crawler-web/src/main/webapp/WEB-INF/views/crawler/list.jsp
	crawler-web/src/main/webapp/WEB-INF/views/default.jsp
	crawler-web/src/main/webapp/WEB-INF/views/login.jsp
	crawler-web/src/main/webapp/WEB-INF/views/section.jsp
	crawler-web/src/main/webapp/WEB-INF/views/website/config.jsp
	crawler-web/src/main/webapp/WEB-INF/views/website/index.jsp
	crawler-web/src/main/webapp/common/footer.jsp
	crawler-web/src/main/webapp/common/header.jsp
Merge branch 'master' of https://github.com/cloudsharl/crawler

Conflicts:
	crawler-web/src/main/resources/springMVC.xml
	crawler-web/src/main/webapp/WEB-INF/views/crawler/list.jsp
	crawler-web/src/main/webapp/WEB-INF/views/default.jsp
	crawler-web/src/main/webapp/WEB-INF/views/login.jsp
	crawler-web/src/main/webapp/WEB-INF/views/section.jsp
	crawler-web/src/main/webapp/WEB-INF/views/website/config.jsp
	crawler-web/src/main/webapp/WEB-INF/views/website/index.jsp