update
Merge branch 'master' of https://github.com/hilr/900

Conflicts:
	nodejs/lib/controllers/IdManager.js
	nodejs/lib/controllers/VendorManager.js
	nodejs/lib/services/CouponService.js