maya cam ok
Merge branch 'master' of https://github.com/hiroMTB/3s1e

Conflicts:
	study/maya_dae_camera_1/src/ofApp.cpp
	study/maya_dae_camera_1/src/ofApp.h