Merge branch 'dev'

Conflicts:
	php/session.php