Merge branch 'master' of https://github.com/ecolehetic/travelrG1

Signed-off-by: fpumir <fpumir@terredeweb.fr>

Conflicts:
	app/Controllers/App_controller.php
Merge branch 'master' of https://github.com/ecolehetic/travelrG1

Signed-off-by: fpumir <fpumir@terredeweb.fr>

Conflicts:
	app/Controllers/App_controller.php