1
Merge branch 'master' of https://github.com/GORRShuttle/staging_rrs_web

Conflicts:
	modules/order/confirm.php
	modules/order/summary.php
	req.xml
	staging_rrs_web.ppx