Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Config/bootstrap.php
fix session error