error string concat
Merge branch 'master' of https://github.com/venturio1256/licode