Edited some of the views
Merge branch 'master' of https://github.com/graemefunk87/3910Assignment2

Conflicts:
	WebContent/viewtimesheet.xhtml
Took my version.