remove firmware_version and calibrations_datetime from InstrumentDeviceExtended
Fix OOI preload for data products
Merge branch 'master' of github.com:ooici/coi-services

Conflicts:
	extern/ion-definitions
Reset pyon to where it was before
Fixed OOI preload PlatformDevice Org sharing
Bumped ion-defs
Bumped pyon
Adding generic prepare resource support
Merge pull request #1025 from shenrie/master

Adding generic prepare resource support
Lost connection handling implemented, including re-connection logic
fix statuses, add more tests
Merge pull request #1026 from ifreecarve/2013-05-02_buildbot_fix

fix statuses, fix buildbot, add more tests
Use patched gevent on our repo instead
add scheduler sheet to support UNS batch processing
remove log
Added alert manager to platform agent.
add strip()
Merge pull request #1027 from MauriceManning/loadScheduler

Load scheduler
Bunp pyon so base agent flushes state as necessary in non RPC threads.
Flush agent state where in a non rpc threads.