issue fixed
Merge branch 'master' into development

Conflicts:
	app/mailers/ticket_mailer.rb
	app/views/ticket_mailer/new_ticket_email_with_user.html.erb
	app/views/ticket_mailer/new_ticket_email_without_user.html.erb