Changed order management
Merge branch 'master' of https://github.com/jaggs6/dskyas

Conflicts:
	SKYAS/web/order_management.jsp