added client-side changes necessary for concurrent editing
Merge branch 'master' of https://github.com/ddp34/WebIDEPodgurski2014