Revert "pushed new branch for GUI changes"

This reverts commit 33138fddb7e7246037c4ba6076d276b425c266d8.

Conflicts:
	Sidescroller-csharp.sln
	Sidescroller.sln
	Sidescroller.userprefs