Feature/improve cordova bundle