Advanced quick search.: refs  #612, #554
Merge branch 'dev' of github.com:projestimate/projestimate into dev