changing some naming conventions
Merge branch 'master' of github.com:mas-group/sdp_ws2013_opencv