update
Merge branch 'master' of https://github.com/nguyenthien/test_api

Conflicts:
	app/controllers/api/ApiProductOfferMessagesController.php