fix issue 40 https://github.com/geekhub-php/ck-portal/issues/40
Merge branch 'fixissue40' into develop
Merge branch 'develop' of github.com:geekhub-php/ck-portal into develop