if thumbnail doesn't have content type, don't bork
Merge branch 'JNAP' of github.com:sightmachine/SimpleSeer into JNAP
added reinit() function to re-initialize cameras
Was call to init()
JNAPC-185 fix typo in camera reinit yield
adding Tab for new interface
Merge pull request #1334 from Tendrid/JNAP

adding Tab for new interface
Add default safe write concern when saving via crud
Merge pull request #1356 from demaagdk/JNAP

Add default safe write concern when saving via crud
field fixes for modbus, thumbnail generation
up timeout
field fixes for modbus, thumbnail generation

Conflicts:

	SimpleSeer/views.py
merge conflits
Merge branch 'camera-hotfix-12-13-13' of ssh://jnap1/home/sm/Code/SimpleSeer into JNAP

Conflicts:
	SimpleSeer/views.py
Merge branch 'JNAP' of https://github.com/oostendo/SimpleSeer into JNAP
Merge branch 'JNAP' of github.com:oostendo/SimpleSeer into JNAP
Merge pull request #1366 from oostendo/JNAP

field fixes for simpleseer from JNAP
Merge pull request #1403 from ahomatthew/projects/jnap

Projects/jnap
Merge pull request #1404 from ahomatthew/projects/jnap

Removed references to context
Merge pull request #1405 from ahomatthew/projects/jnap

One more removal