imple bid end_time remain + check expired bids

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

Conflicts:
	src/main/java/com/vteam/xml_project/service/AdminService.java

	modified:   src/main/java/com/vteam/xml_project/api/AdminAPI.java
	modified:   src/main/java/com/vteam/xml_project/api/OrderHistoryAPI.java
	modified:   src/main/java/com/vteam/xml_project/dto/OrderHistoryDTO.java
	modified:   src/main/java/com/vteam/xml_project/service/AdminService.java
	modified:   src/main/resources/service.xml
	modified:   src/main/webapp/WEB-INF/views/admin_order.jsp
	modified:   src/main/webapp/WEB-INF/views/admin_product.jsp
	modified:   src/main/webapp/WEB-INF/views/resources/js/admin_order.js
	modified:   src/main/webapp/WEB-INF/views/resources/js/login.js