Finalizada a configuração do SAML
Merge branch 'master' of https://github.com/marcelo-nasajon/NasajonWebTeamplateProject

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/profiler/index.csv
	app/logs/dev.log