commit fix
Merge branch 'master' of https://github.com/Superzer0/dashboard
Merge branch 'master' of https://github.com/Superzer0/dashboard

Conflicts:
	Dashboard.DataAccess/Dashboard.DataAccess.csproj