feature #5157 udpate and improve basket view
update ad improve order view

Conflicts:
	gallery/gallery-war/src/main/webapp/gallery/jsp/mediaPhotoView.jsp