Step
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	src/java/com/una/vdc/services/CollegeClassService.java
	web/step.html