Done Active Giftcode
Merge branch 'Duc_gift_code_active' into hung_gift_code_issue

Conflicts:
	api/controllers/GiftCodeController.js
	config/routes.js