add schedule
Merge branch 'master' of https://github.com/hunterbmt/xml_project

Conflicts:
	src/main/java/com/vteam/xml_project/context/listener/ApplicationListenerBean.java
	src/main/java/com/vteam/xml_project/service/UserService.java

	modified:   src/main/java/com/vteam/xml_project/api/OrderHistoryAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/UserAPI.java
	modified:   src/main/java/com/vteam/xml_project/context/listener/ApplicationListenerBean.java
	modified:   src/main/java/com/vteam/xml_project/dto/OrderHistoryDTO.java
	modified:   src/main/java/com/vteam/xml_project/dto/OrderHistoryListDTO.java
	modified:   src/main/java/com/vteam/xml_project/hibernate/dao/OrderHistoryDAO.java
	modified:   src/main/java/com/vteam/xml_project/service/OrderHistoryService.java
	modified:   src/main/java/com/vteam/xml_project/service/UserService.java
	modified:   src/main/webapp/WEB-INF/views/product_list.jsp
	modified:   src/main/webapp/WEB-INF/views/resources/js/login.js
	new file:   src/main/webapp/WEB-INF/views/resources/xsl/order_history_pdf.xsl