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

Conflicts:
	app/controllers/AuthController.java
	conf/routes
	project/Build.scala
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	app/controllers/AuthController.java
	conf/routes
	project/Build.scala