Merge branch 'kridev'
minor code cleanup
Added MarkerCC2Tracker
First working version after refactor
Refactor complete, compile in debug mode fixed
Merge branch 'MCC1WrapperClass' into kridev