Merge branch 'master' into feature/get_pre_canvas
...
# Conflicts:
# app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java
# app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java
# app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java
# app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java
# app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java