Adicionando gridGenerica s
Adicionando
Merge remote-tracking branch 'origin/master'

Conflicts:

	GrandeViaFitness/src/main/java/com/br/GrandeViaFitness/componentes/ActionButtonPanel.html

	GrandeViaFitness/src/main/java/com/br/GrandeViaFitness/componentes/ActionButtonPanel.java

	GrandeViaFitness/src/main/java/com/br/GrandeViaFitness/componentes/IDataSorteProvider.java

	GrandeViaFitness/src/main/java/com/br/GrandeViaFitness/pages/visao/HomePage.java