.
Merge branch 'master' of git://github.com/Graungaard/PlanAChaos

Conflicts:
	PAC/PAC.DesktopClient/ViewModels/ApplicationViewModel.cs