scan, credit
Merge branch 'ambesh' into gunanka

Conflicts:
	app/models/support_user/employee.rb
validation added