updated async thread stuff for realtime
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Heartbeat health and _status
updates for #SSEER-14
stupid conflict
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
adding files for #SSEER-14
Added kiosk mode in supervisor and added chrome heartbeat response
Added paster template for browser.conf
Merge pull request #1081 from brooksryba/develop

#SSEER-25
Merge pull request #1079 from ahomatthew/develop

#SSEER-27, #SSEER-55, #SSEER-52
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Added try/catch for simpleseer import images
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Added error in log
Merge pull request #1082 from Tendrid/develop

#SSEER-14
quick migration fix
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Nate: Fixed issues with get_plugin and to_validate