- capped framerate to 30 fps.
- added support for frame scrubbing.
Merge branch 'master' of github.com:tetard/prosopagnosia

Conflicts:
	src/testApp.cpp
	src/testApp.h