fix issue #32
Merge branch 'fix/issues-32_warp_affine_useless_3rd_arg' into develop
update OpenCV version
Merge branch 'feature/support_opencv-2.4.6.1' into develop
bump up version
bump up version
Merge branch 'develop' of github.com:ruby-opencv/ruby-opencv into develop
Merge branch 'develop' into feature/add_FaceRecognizer

Conflicts:
	ruby-opencv.gemspec
add CvMat#apply_color_map
add some constants of CvMat depth
modify CvMat#normalize to use depth type parameter
fix CvMat#apply_color_map for invalid parameter