routes nou 1
Merge origin/master

Conflicts:
	app/routes.php