UI updates.
Resolving conflicts
Resolving conflicts
Merge branch 'master' of
https://github.com/preetigupta2000/timemanagement.git

Conflicts:
	.classpath
	application.properties
	grails-app/views/clientPage.gsp
AFter resolving conflicts