Session inactivity timeout/timelife  refs #317
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/application_controller.rb