Using shell command `which` in a portable way
Merge branch 'master' into rmi
Adopted websocket to refactored version of ng.django.websocket
Cleaned the websocket code and removed useless try/catch-blocks