a2014-12-24: add to merge for committing
Merge branch 'major' of https://github.com/f1t51b21c1p69mf86ctw611258/30n3Rat3_6 into major
2014-12-24: sau khi change sub_offer_id di kem voi reseller_version_id