Merge remote-tracking branch 'kaazing/develop' into develop

Author: lloish

android/jms/README.md

@@ -19,12 +19,12 @@ This tutorial shows how Android application can communicate over the web with an
    - Run the application from Android Studio by selecting Run/Run Project. Refer to [Running Your App](https://developer.android.com/training/basics/firstapp/running-app.html) for more information.
 
 
-## Interact with Kaazing Java WebSocket Client API
+## Interact with Kaazing Android JMS Client API
 
-Checklist how to create Kaazing Android WebSocket JMS application from scratch, to be able to send and receive JMS messages over WebSocket can be found [here](http://kaazing.com/doc/5.0/jms_client_docs/dev-android/o_dev_android.html).
+Checklist how to create Kaazing Android JMS application from scratch, to be able to send and receive JMS messages over WebSocket can be found [here](http://kaazing.com/doc/5.0/jms_client_docs/dev-android/o_dev_android.html).
 
 ## API Documentation
 
 API Documentation for Kaazing Java WebSocket JMS Client library is available:
 
-* [Kaazing JMS](https://kaazing.com/doc/jms/4.0/apidoc/client/java/jms/index.html)
+* [Kaazing JMS](http://kaazing.com/doc/5.0/jms_client_docs/apidoc/client/android/jms/index.html)

android/ws/README.md

@@ -19,13 +19,13 @@ The `echo` service, running inside the Kaazing WebSocket Gateway, reflects back
    - Create Android Virtual Device (AVD) for API level 19 (KitKat) or higher. For more information refer to [Create and Manage Virtual Devices](https://developer.android.com/studio/run/managing-avds.html)
    - Run the application from Android Studio by selecting Run/Run Project. Refer to [Running Your App](https://developer.android.com/training/basics/firstapp/running-app.html) for more information.
 
-## Interact with Kaazing Java WebSocket Client API
+## Interact with Kaazing Android WebSocket Client API
 
 Checklist how to create Kaazing Android WebSocket Echo application from scratch, to be able to send and receive Echo messages over WebSocket can be found [here](http://kaazing.com/doc/5.0/websocket_client_docs/dev-android/o_dev_android.html).
 
 ## API Documentation
 
 API Documentation for Kaazing Java WebSocket Client library is available:
 
-* [Kaazing WebSocket](https://kaazing.com/doc/legacy/4.0/apidoc/client/java/gateway/index.html)
+* [Kaazing Android WebSocket API](http://kaazing.com/doc/5.0/websocket_client_docs/apidoc/client/android/gateway/index.html)