join 127.0.0.1 and 'celery-task_status' URI properly

A '//' at the beginning of the URI was causing a 404.
Merge branch 'master' into 088-merge-conflicts
lock all edit btns when collection behind,conflicted

Applies to collection, entity, file edit and add/new btns.