.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	PAC/PAC.DesktopClient/App.xaml
	PAC/PAC.DesktopClient/App.xaml.cs
	PAC/PAC.DesktopClient/PAC.DesktopClient.csproj
	PAC/PAC.DesktopClient/Views/HomeView.xaml.cs
.
k
Merge pull request #5 from Graungaard/master

IkkeEtPunktum