add mail trial 2
error in mergeMerge branch 'mail'

Conflicts:
	app/controllers/skills_controller.rb