Fixing Buttons and redirect issues: refs  #657
Merge branch 'dev' of github.com:projestimate/projestimate into dev