fixes
merge
Merge branch 'master' of github.com:CodeKnights/hackathon

Conflicts:
	hackathon1/.idea/workspace.xml
	hackathon1/pom.xml
	hackathon1/src/main/java/com/codeknights/hackathon1/api/service/UsuarioService.java
	hackathon1/src/main/java/com/codeknights/hackathon1/controller/filters/SecurityFilter.java
	hackathon1/src/main/java/com/codeknights/hackathon1/serviceimpl/LoginServiceImpl.java