Careeglos vARIos
Merge branch 'master' of github.com:bengui/giombu

Conflicts:
	views/partials/coupons/view.jade