Step 2 on the swipe thingy
Merge branch 'master' of https://github.com/bobbyziom/AquaControl

Conflicts:
	AquaControl/AquaControl.csproj
	AquaControl/MainWindow.cs
	AquaControl/Widgets/Base/WidgetConstruct.cs