Make pivot in design more work again (sort of).
Merge branch 'personal'

Conflicts:
	NoppaClient/NoppaClient.csproj