Fix demo scripts
Fix thunk scripts, not running because of other issues
Merge branch 'dev-master' of github.com:cn-uofbasel/ccn-lite into dev-master