Added cursor support in the client
Merge branch 'cursors' into ace-cursors