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
Merge branch 'priya_devel' into neworg

Conflicts:
	open-connectome/django/templates/restoreproject.html
	open-connectome/ocpca/ocpcadb.py