fixed sessions
Merge branch 'take2'

Conflicts:
	DB.pm