Added new AddObjectWizardForm (to replace current add object form, in progress). Added cylinder shape. Display object type in side panel. Some changes to resolve namespace inclusion issues.
Merge remote-tracking branch 'origin/Mike' into kchen

Conflicts:
	BlinkAnalysis/BlinkAnalysis.vcxproj.filters
Fixing compilation error from merge