issue on session_expiration: refs  #640
Merge branch 'dev' of github.com:projestimate/projestimate into dev