fixed issue with crashing erizoJS not recognized by controller
Merge pull request #214 from K-GmbH/bugfix

fixed issue with crashing erizoJS not recognized by controller
Changed KEEPALIVE variable name
Merge branch 'master' of https://github.com/ging/licode
Changed KEEPALIVE
Merge remote-tracking branch 'upstream/master'