ShiftSwap
Merge branch 'master' of https://github.com/Pimple/Proshops-Vagtplan

Conflicts:
	Vagtplan/Classes/Service.cs