Commit before pull
Re-arranging of the code

Merge branch 'master' of github.com:mas-group/sdp_ws2013_opencv

Conflicts:
	DisplayImage/src/DisplayImage.cpp