updated apitest - now mostly finished for v1
merge with lorenzo's

Merge branch 'master' of github.com:lcaggio/Live-streaming-in-a-box