added videosources, reverted to original Makefile
added videosources, reverted to original Makefile
added opencv vidsource to makefile, and sony camera params
fixed merge
Merge branch 'develop'