...
Merge branch 'master' of https://github.com/mdrska80/timesheet

Conflicts:
	Timesheet.pro.user
Cleaning up
Some cleaning