Ingest kat13ecs.
Merge branch 'master' of github.com:openconnectome/EM-connectome
changes from master
development branch for projadmin
updated project admin
REmoved bootstrap toolkit
Upsampling for annotations.
Remove build directories.  How did they get in there?
Resolved merge conflict in settings.py
Removed resolution from projinfo query
Updated tests to include resolution
Updated Project Admin
Fix resolution in db.cutout to use requested resolution rather
than the project resolution.
Changes for bg1dev integration of annotation project resolution.
Remove working files for cython.
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
Merge branch 'priya_devel'
New master branch with zoom for annotations and project administration.