Fixed sessions (sorry!!)
Added bcrypt support with jBCrypt
Merge remote-tracking branch 'origin/fix-timeouts'