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

Conflicts:
	app/controllers/AuthController.java
	conf/routes
	project/Build.scala
Tela de Peso e Altura
Merge branch 'master' of https://github.com/Salus-PDS/web

Conflicts:
	conf/routes
	utils/app/salus/helpers/Fmtr.java
Merge branch 'master' of https://github.com/Salus-PDS/web