adjusts
Merge branch 'master' of https://github.com/ThiagoFacchini/websitev2

Conflicts:
	web/app_dev.php