Updated readme
Merge branch 'client' into development