Merge branch 'master' of https://github.com/pjohansson77/Remote-Lock

Conflicts:
Client.java
hjkasd