AdminSetting Management in local instance : refs #341
Merge branch 'dev' of github.com:projestimate/projestimate into dev