Client side Validations
Merge branch 'ems' of github.com:vibhor86/Trantor-management-system into ems

Conflicts:
	app/models/user.rb