feedback mail
Merge branch 'ambesh' into gunanka

Conflicts:
	app/models/ticketing/ticket.rb
feedback mailer views