change entity relationship
Merge branch 'master' of https://github.com/NorthFury/hackathon
fix AuthenticaitonFilter.java
Merge branch 'master' of https://github.com/NorthFury/hackathon