Fixes

• Braintree keys that were not been saved in the settings page.
• Code internal fixes to prevent usage of PHP Short tags.