Fixed a small focus issue
Merge branch 'Development'

Conflicts:
	SwitcherooForm.cs