continuacao da tela de Cadastro de pastas(parcialmente dev)
Merge branch 'master' of
https://github.com/pedrotreccani/LegislacaoAgroambientalWeb.git

Conflicts:
	LegislacaoAgroambientalWeb/app/controllers/ControladorPasta.java
	LegislacaoAgroambientalWeb/app/models/Pasta.java
	LegislacaoAgroambientalWeb/app/views/pasta.scala.html
	LegislacaoAgroambientalWeb/conf/application.conf