Summary
Merge remote-tracking branch 'origin/master'

Conflicts:
	TeemaApplication.v12.suo
	TeemaApplication/Reports/AttendanceReport.rpt
	TeemaApplication/Reports/BasicSalaryReport.rpt
	TeemaApplication/TeemaApplication.csproj.user
	TeemaApplication/TeemaApplicationMain.Designer.cs
	TeemaApplication/TeemaApplicationMain.cs