changes in feedback views
Merge branch 'gunanka' into ambesh
Merge branch 'gunanka' into ambesh
changes for feedback mailer
refactoring code in controller
modification in controller after 2nd code reviews
code review changes
o
Merge branch 'ambesh' into gunanka

Conflicts:
	app/models/customer/support_activation.rb
	app/models/feedback/ticket_feedback.rb