Fixed typo in ChatServer and ChatClient tests.
Added deletion of test files in build.gradle
Merge branch 'master' into develop