Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of git@github.com:robomon1/licode.git
Merge upstream master into local master
Merge branch 'master' into secure