Checkin ver 1.3.0-Pre Test main branch to rel branch merge ***NO_CI***. See Test label MainToRel_1.3.0-Pre_131227_2328.
Post resolve checkin ver 1.3.0-P2 UI main branch to rel branch merge ***NO_CI***. See UI label MainToRel_1.3.0-P2_131231_1255.
Checkin ver 1.3.0-P3 UI main branch to rel branch merge ***NO_CI***. See UI label MainToRel_1.3.0-P3_131231_1339.
Post resolve checkin ver 1.3.0 UI main branch to rel branch merge ***NO_CI***. See UI label MainToRel_1.3.0_140106_753.
Post resolve checkin of ver 1.3.1 UI main branch to rel branch merge ***NO_CI***. See UI label MainToRel_1.3.1_140108_931.
Post resolve checkin of ver 1.3.2 UI main branch to rel branch merge ***NO_CI***. See UI label MainToRel_1.3.2_140109_1944.
Post resolve checkin of ver 1.4.0 UI main branch to rel branch merge ***NO_CI***. See UI label MainToRel_1.4.0_140205_104.
navigation fixes
made link in order conf email work
fix RMA approved email
merge
seismic changes 1
nav fixes for hiding stuff
email tempaltes for returns
email templates con't
Fixing bad error handler in models-checkout
Updated addressmodels to handle international state situations
populate ip address
updating compiled resources
fix to partial address on pickup in store