to pull
Merge branch 'develop' of http://github.com/KernelCorp/mygenetics into develop

Conflicts:
	app/controllers/coupons_controller.rb