UI Changes
error validation
Merge branch 'master' of https://github.com/caioddm/TimeTracker

Conflicts:
	code/app/views/manageusers/index.html.erb
	code/app/views/requests/admin_index.html.erb