Basic caching mechanisms.
Merge branch 'master' of github.com:Domiii/smart-video-2013

merge conflicts

Conflicts:
	SmartVideo/src/SmartVideo.cpp