Merge branch 'fixing/MeasuresClass'
drwxr-xr-x - Client
drwxr-xr-x - Server
drwxr-xr-x - documents
drwxr-xr-x - www