Update tabs to spaces
Merge branch 'cpp' of https://github.com/scottdensmore/callisto into cpp

Conflicts:
	cpp/Callisto/Callisto/Flyout.cpp
Update more C++ code