Merge remote-tracking branch 'origin/Mike' into kchen
Added ability to add boxes; separated CaptureObject into subclasses; major refactoring in AddObjectForm, some in MainForm as well; bug fixes in CaptureWorld; misc code clean up
Merge remote-tracking branch 'origin/Mike' into kchen

Conflicts:
	BlinkAnalysis/AppViewer.cpp
Merge branch 'kchen' of https://github.com/mdfeist/BlinkAnalysis into Mike