Fixed annotation for mapping
Merge branch 'develop' of github.com:geekhub-php/ck-portal into develop