merge
Merge branch 'master' of https://github.com/yuridiniz/Timesheet

Conflicts:
	Timesheet/MainWindow.xaml.cs