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

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

Conflicts:
	Dashboard/Dashboard.csproj