Rotas
Merge branch 'master' of https://github.com/Salus-PDS/web
Merge branch 'master' of https://github.com/Salus-PDS/web
Merge branch 'master' of https://github.com/Salus-PDS/web
Merge branch 'master' of https://github.com/Salus-PDS/web
Merge branch 'master' of https://github.com/Salus-PDS/web
Começo do attendantService
Merge branch 'master' of https://github.com/Salus-PDS/web
Começo do attendantService
Merge branch 'master' of https://github.com/Salus-PDS/web

Conflicts:
	conf/routes
Merge branch 'master' of https://github.com/Salus-PDS/web