new version-2014.05.11-night
Merge branch 'master' of github.com:gjq1218/ducking-octo-bugfixes

Conflicts:
	WebRoot/Adminleftbar.jsp
	WebRoot/Cartresult.jsp
	src/Actions/AdminLoadUserReservation.java
	src/struts.xml
near final version-2014.05.12-early morning