working on timesheet
Merge origin/master

Conflicts:
	src/Presentation/Frames/MainFrame.java
Timesheet videre
Merge origin/master
Merge origin/master
Merge origin/master
error fixes