Merge branch 'fix_eigen_for_indigo'
Merge branch 'projection_matrix'
Merge branch 'master' of http://github.com/jsk-ros-pkg/jsk_recognition
use ifdef not if for OPENCV_NON_FREE
Merge pull request #405 from k-okada/fix_non_free

use ifdef not if for OPENCV_NON_FREE