Merge remote-tracking branch 'upstream/develop' into develop
fisher ready

Signed-off-by: jayrambhia <jayrambhia777@gmail.com>
multiple camera instances enabled

Signed-off-by: jayrambhia <jayrambhia777@gmail.com>
Revert "virtual camera upgrades - I did a lot of changes too closes #412"

This reverts commit 8e4b70570dad9553ee10f14b02c039c9bac8a06a.
Merge branch 'develop' of github.com:jayrambhia/SimpleCV into develop
Merge remote-tracking branch 'upstream/develop' into develop

loses #412"

This reverts commit 8e4b70570dad9553ee10f14b02c039c9bac8a06a.
trying to resolve broken tests
OpenCV 2.3.1 doesn't really support anything. Made appropriate changes.

Signed-off-by: jayrambhia <jayrambhia777@gmail.com>
Revert "virtual camera upgrades - I did a lot of changes too closes #412"

This reverts commit 8e4b70570dad9553ee10f14b02c039c9bac8a06a.
virtual camera upgrades - I did a lot of changes too closes #412
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' of github.com:jayrambhia/SimpleCV into develop
virtual camera upgrades - I did a lot of changes too closes #412
Merge branch 'develop' into Keypoints/test_cleanup
channel mixer added
Copy cv.QueryFrame() into freshly created image

Due to every cv.QueryFrame() modifies the same memory area we have
to use cv.CreateImage() and copy our cv.QueryFrame() into it. This
should fix the issue #96.
fixed some stuff, removed ;
Modified script for fancyness
Merge branch 'develop' of github.com:sightmachine/SimpleCV into develop
Added scripts
Working on getting JS script working for indices