Release prep
Merge branch 'release/3.0.5' into develop
Added joola.io.engine
JARVIS-338 Refactoring