Anderson's Change
Merge remote-tracking branch 'origin/master'

Conflicts:
	MadeWeb/app/controllers/Application.scala
	MadeWeb/conf/messages.pt-BR