sample data for timesheets work now
Merge branch 'develop' of https://github.com/shsu/comp4911 into develop

Conflicts:
	src/main/webapp/js/services.js