implement stubs which are triggered via emitted websocket event, also add hammerjs event delegation
fix merge conflict