Merge branch 'master' into bullet
...
# Conflicts:
# .idea/caches/build_file_checksums.ser
# app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java
# app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java
# app/src/main/res/layout/ui_fragment.xml