Merge branch 'master' of https://github.com/CEmocca/OrbitReservation

Conflicts:
	OrbitOReservation/WebContent/package_sub1.jsp