fix redefinition warnings for $order_ref and $creds
Merge branch 'master' of https://github.com/Whapps/catalogapi