Re-commit , Form tweaks, hopefully the sln does not get changed this time
Merge remote-tracking branch 'remotes/aurbo/master' into x
Revert Aurbo's unintented change to the sln file