Merge with Ten24
Merge remote-tracking branch 'Ten24/rc3' into rc3

Conflicts:
	admin/views/print/default.cfm
Merge remote-tracking branch 'Ten24/rc3' into rc3
Merge remote-tracking branch 'Ten24/rc3' into rc3
Adds shipping method name (if any), location and order link to delivery view. Solves issue 1806
Merge remote-tracking branch 'dzikakis/rc3' into feature-listingdisplaysearch
Merge remote-tracking branch 'dzikakis/rc3' into feature-listingdisplaysearch