Fixed mappings
Fixed mappings and @Service
Fixed mappings and @Service
Merge branch 'master' of https://github.com/Auronspan/Survive.git
Merge branch 'master' of https://github.com/Auronspan/Survive.git