Fix opentok + merge issue
Merge branch 'master' of https://github.com/jayded/haa
Update licenses & acknowledgements