Fix nl2br issue
Merge pull request #39 from scottcwilson/ISSUE_5

Fixes ISSUE-5 nl2br issue in sidebox
CHANGE-674 GV order total amount not included in checkout_payment screen (ot_gv)
CHANGE-523: Discount Coupon updates and new features and clean up
clean up debug code
Fix missing hidden_field
ISSUE-78 - Add currency ISO codes link to Admin currencies page
CHANGE-675 - Update country ISO codes link to reflect changes to the ISO website
CHANGE-675 - Update country names to reflect changes in the ISO standards thru end of 2013
CHANGE-684 - Fix rare division by zero error occurring when passing invalid data to currency update check
CHANGE-683 - Modify order-class notifier prior to customer email
CHANGE-685 - Fix stock reduction problem with checkbox/attribute combinations in cart
CHANGE-681 - Fix admin scenario of mixed content embedded on a page (subtask of CHANGE-677)
CHANGE-678 - Adjust banner-manager code to stop triggering a false-positive alert on query parameters
ISSUE-71 - Use debug_backtrace() to determine query_factory caller on error
ISSUE-80 - Remove unnecessary left join and table from db query in attributes controller
CHANGE-682 Don't need products url for product_music type. causes false
positive on skipfish
CHANGE-679 - add space to regex to try and mitigate against skipfish false
merging 152 upgrade sql into 160
CHANGE-686 ensure output is correctly sanitized.
CHANGE-677 update tests to set catalog to ssl from admin
Header dates