Merge branch 'dev' of http://10.1.235.20:3000/ipu/android-share into dev

# Conflicts:
#	show-client/app/build.gradle
#	show-client/app/src/main/assets/mobile-action.xml