edited code
clean up on code
removed useless code
edited context.xml.stg
Merge branch 'CRF47724_compare_cart_bug' into production
 merged from CRF47724_compare_cart_bug
Merge branch 'production' into logs_for_hashing_password_issue
merged from production