Fixed off by one error in ocpcatmaid at the expense of loading the dataset configuration every time.
Merge branch 'master' of github.com:openconnectome/EM-connectome
Debugged correction to zslice in ocpcatmaid.
Merge branch 'master' of github.com:openconnectome/EM-connectome
Initial version to ingest Wei's small data.
Merge remote-tracking branch 'remotes/origin/priya_devel' into rb4wei
Merge branch 'priya_devel' into rbdevel

Conflicts:
	web/emca/emcaproj.py
WOrks on rio.  To braingraph2 for admin interface with nginx.
Added 16 bit stack generator.
Remove working files.
Merge branch 'priya_devel' into rbdevel
Merge branch 'priya_devel' into rbdevel

Conflicts:
	web/emca/emcaproj.py
Merge branch 'priya_devel' of github.com:openconnectome/EM-connectome into priya_devel
Merge branch 'priya_devel' into rbdevel
Merge branch 'priya_devel' of github.com:openconnectome/EM-connectome into priya_devel
Added isotropic stack support.
Test for isostack functionality.
Changes for multi-channel catmaid.
New multi-channel catmaid.
Merge branch 'rbdevel' of github.com:openconnectome/EM-connectome into rbdevel

Conflicts:
	web/django/EMOCP/settings.py
	web/emca/emcadb.py
	web/emca/emcaproj.py