- optical flow tracking of ROI
Merge branch 'master' of https://github.com/Portalen/Portalen

Conflicts:
	Portalen.xcodeproj/project.pbxproj
	src/ofApp.cpp
	src/ofApp.h
- Fixing some merge errors regarding flags