Misc updates
Merged session module
Merged updates
Database config file