cleaning up code
Merge remote-tracking branch 'origin/master'

Conflicts:
	TABit/Main.Designer.cs