Object tracking codes.
Merge branch 'master' of github.com:Domiii/smart-video-2013

Conflicts:
	SmartVideo/smart-video-2013.vcxproj.filters
	SmartVideo/src/SmartVideo.cpp
	SmartVideo/src/SmartVideo.h
	config.json