Depoir de Merge
Agora Activity adiciona uma Class padrao.
Merge branch 'master' of https://github.com/rguimaraens/org.consultjr.EventsManagement

Conflicts:
	.gitignore
	src/main/java/org/consultjr/mvc/controller/ActivityController.java
	src/main/java/org/consultjr/mvc/model/Activity.java
	src/main/webapp/views/Activity/_form.jsp