Settings page done
Merge branch 'master' of https://github.com/Superzer0/dashboard

Conflicts:
	Dashboard.DataAccess/DashboardDbContext.cs
	Dashboard/Dashboard.csproj
Merge branch 'master' of https://github.com/Superzer0/dashboard