Emptying master branch for the moment
	Merge branch 'master' into develop

Conflicts:
	mod_session.php
	mod_session.xml
	tmpl/default.php