Update README.md
Merge branch 'develop'
Merge branch 'develop'
[Opencv2.4.2 or Opencv2.4.9]

The current project is developed under OpenCV 2.4.9. It is about to be
tested on OpenCV2.4.2 on Sharcnet.
Revert "[Opencv2.4.2 or Opencv2.4.9]"

This reverts commit b35c5f2279c31411a52d73e64c8e4e7b2eb6c1e0.
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'develop'
Merge branch 'develop'
update makefile
Merge branch 'master' into develop