ading new employee
Merge branch 'ambesh' into gunanka

Conflicts:
	app/views/support_actions/tickets/index.html.erb