Changes 17/4
blah
Merge branch 'master' of https://github.com/am2990/Geschu

Conflicts:
	GestureClient/Controller.xaml.cs
	GestureClient/GestureClient.csproj