Merge global
Merge global updated
Fixed host bug in restore project page and has global merge implemented
Merge branch 'priya_devel' of github.com:openconnectome/EM-connectome into priya_devel

Conflicts:
	web/emca/emcadb.py
	web/examples/out1.txt
Branch with  gloabal merge and exceptions working
New organization.
Merged reorg to rbdevel in a way that will let us apply merges from upstream.
Merge branch 'rbdevel' into neworg

Conflicts:
	open-connnectome/django/ocpca/views.py
	open-connnectome/ocpca/emcaprivate.py.master
	open-connnectome/ocpca/ocpcadb.py
	open-connnectome/ocpca/ocpcaproj.py
Templates fixed for Django 1.5
Add ocppaths to example.
Type in open-connectome
Private files.
Add pip frozen file.
Add README
More configuration information.
Add quotes.
Setup and configuration information
Setup information.
Registration
Merge branch 'neworg' of github.com:openconnectome/EM-connectome into neworg