Minor changes!
Added casting in menu from machine* to Switchbox*
Merge branch 'TestBranch' into Automatic

Conflicts:
	src/menu.cpp