Merge branch 'master' into hotfix

README.md

@@ -2,23 +2,23 @@
 
 ![Mstsc.js Logo](./client/img/mstsc.js.png)
 
-**Mstsc.js** is pure javascript Microsoft RDP (Remote Desktop Client) client using nodejs, [**node-rdpjs**](https://github.com/citronneur/node-rdpjs) and socket.io. It allows you to connect to any terminal server compatible application, through web browser (optimized for firefox, compatible with chrome and internet explorer 11).
+**Mstsc.js** is a pure javascript Microsoft RDP (Remote Desktop Client) client using nodejs, [**node-rdpjs**](https://github.com/citronneur/node-rdpjs) and socket.io. It allows you to connect to any terminal server compatible application, through a web browser (optimized for firefox, but compatible with chrome and internet explorer 11 too).
 
 <img src='./img/mstsc.js.login.png' width=200/>
 <img src='./img/mstsc.js.connect.png' width=200/>
 <img src='./img/mstsc.js.explorer.png' width=200/>
 
 ## Cozy-Cloud
 
-Mstsc.js is design to work with **Cozy-Cloud**!
+Mstsc.js is designed to work with **Cozy-Cloud**!
 
 ![Cozy Logo](https://raw.github.com/mycozycloud/cozy-setup/gh-pages/assets/images/happycloud.png)
 
-[**Cozy**](http://cozy.io) is a platform that brings all your web services in the
+[**Cozy**](http://cozy.io) is a platform that brings all your web services into the
 same private space.  With it, your web apps and your devices can share data
 easily, providing you
 with a new experience. You can install Cozy on your own hardware where no one
-profiles you.
+is spying.
 
 ## Install
 
@@ -40,10 +40,10 @@ node server.js
 
 ### Frontend
 
-Frontend application use socket.io and canvas for binding with mstsc.js backend. The front-end is in charge of bitmap decompression trough rle.js file. This file is generated by [**Emscripten**](https://github.com/kripken/emscripten) from [rle.c](https://raw.githubusercontent.com/citronneur/mstsc.js/master/obj/rle.c) which come from rdesktop source.
+The frontend application uses socket.io and canvas for binding with mstsc.js backend. The front-end is in charge of bitmap decompression through rle.js file. This file is generated by [**Emscripten**](https://github.com/kripken/emscripten) from [rle.c](https://raw.githubusercontent.com/citronneur/mstsc.js/master/obj/rle.c) which comes from rdesktop source.
 
 ### Backend
 
-Backend application use nodejs, express and socket.io as web server. Main goal of backend is be a proxy betwwen web browser and terminal server. It use [**node-rdpjs**](https://github.com/citronneur/node-rdpjs) for rdp client.
+The backend application uses nodejs, express and socket.io as the web server. The main goal of the backend is to be a proxy between the web browser and the terminal server. It uses [**node-rdpjs**](https://github.com/citronneur/node-rdpjs) for its rdp client.