Fix back method call to get payment, should be on $order object.
Refactor brand appending code to prevent undefined offset notices
Merge branch 'develop' into mage-18
Inegrate core class changes into overridden files.
Remove Cm_Cache_File class
Integrate patched Mage_Backup lib into project files.
Update TinyMCE upgrading patch to match 1.8 core version workspace
Update the tier pricing option patch to match 1.8 workspace.
Integrate Varien_Image_Adapter patch into workspace files.
Remove un-maintained feature patch for compiler autoload
Split base patches into separate files.
Update the error pages to the 4.0 theme.
Merge branch 'develop' into mage-18
Improve the ordered item notification

* Changes the address and payment labels
* Moves the disclaimer to the end of the message
* Removes detailed payment info
A new (separate) module that handles transactional email customizations
Add a new contact form email template to better thread by subject

Uses new event handle from Unl_Email module.
Merge branch 'develop' into mage-18