code review changes
o
Merge branch 'ambesh' into gunanka

Conflicts:
	app/models/customer/support_activation.rb
	app/models/feedback/ticket_feedback.rb
code review changes