converted everything to spring project and added entities
Merge branch 'release/spring_integration'