Changes for bg1dev integration of annotation project resolution.
Priya debugging changes.
Merge branch 'priya_devel' of github.com:openconnectome/EM-connectome into priya_devel

Conflicts:
	web/django/emca/views.py
	web/django/templates/base.html
	web/django/templates/createdataset.html
	web/django/templates/createproject.html
	web/django/templates/profile.html
	web/django/templates/restoreproject.html
	web/emca/h5projinfo.py
	web/test/test_io.py
	web/test/test_query.py