Added 16 bit stack generator.
Merge branch 'priya_devel' into rbdevel

Conflicts:
	web/emca/emcaproj.py
Added Channel datatype
Merge branch 'priya_devel' into rbdevel
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
Move to example to keep setting from overwriting my state.