Add almond, adapt build
Update demo for new bundle
Make another build without almond for testing
Merge branch 'almond' into packaging
remove debugger