Re-organize the admin permission page (global and project): refs  #581
Merge branch 'dev' of github.com:projestimate/projestimate into dev