updating WS interface
Merge branch 'master' of github.com:rhomobile/rhodes into websocket
Merge branch 'master' of github.com:rhomobile/rhodes into websocket
update to new API
runs only on Android
Merge branch 'master' of github.com:rhomobile/rhodes into websocket
Update descriptions. Changes in error processing.
fix
updating WS interface
update to new API
runs only on Android
Update descriptions. Changes in error processing.
fix
Merge branch 'master' of github.com:rhomobile/rhodes into websocket
Merge branch 'master' of github.com:rhomobile/rhodes into websocket
Merge branch 'websocket' of github.com:rhomobile/rhodes into websocket

Conflicts:
	lib/commonAPI/websocket/ext/websocket.xml
Merge branch 'master' of github.com:rhomobile/rhodes into websocket
Merge branch 'master' of github.com:rhomobile/rhodes into websocket
fix generator to allow no-parent modules on android.
fix websocket disconnect.
Merge pull request #309 from rhomobile/websocket

Websocket