EndMove
45f1bf20f7
Merge branch 'dev' into jeremi
# Conflicts:
# app/src/main/java/lightcontainer/protocol/rules/reader/RetrieveOkRule.java
# app/src/main/java/lightcontainer/protocol/rules/reader/SendOkRule.java
# app/src/main/java/lightcontainer/protocol/rules/writer/GetFileErrorRule.java
# app/src/main/java/lightcontainer/protocol/rules/writer/GetFileOkRule.java
# app/src/main/java/lightcontainer/protocol/rules/writer/SaveFileErrorRule.java
# app/src/main/java/lightcontainer/protocol/rules/writer/SaveFileOkRule.java
