#mg-95 fixed work 4h
#mg-94 fixed
#mg-98 fixed work 1h
partners can see protected news
fix order controller
#mg-100 fixed work 4h
Merge remote-tracking branch 'origin/develop' into develop
coupons controller index
Merge remote-tracking branch 'origin/develop' into develop
coupons controller in_progress
to pull
Merge branch 'develop' of http://github.com/KernelCorp/mygenetics into develop

Conflicts:
	app/controllers/coupons_controller.rb
activate coupon is done
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/coupons_controller.rb
to pull
Merge branch 'develop' of http://github.com/KernelCorp/mygenetics into develop

Conflicts:
	app/controllers/coupons_controller.rb
redirect to partner#show after ban
Merge remote-tracking branch 'origin/develop' into develop
rm unused item
old partners model