Commit for deleting sunspot-solr*.log.lck file
Merge branch 'dev' of github.com:projestimate/projestimate into dev