support change in activation logic
Merge branch 'gunanka' into ambesh

Conflicts:
	app/models/customer/support_activation.rb