Merge pull request #554 from wmathurin/unstable23

Bringing back hybrid samples apps (like we did for Android)