merge conflicts
Merge branch 'snapf' of github.com:vighneshbirodkar/SimpleCV into develop