Merge branch 'master' of
http://114.215.100.48:3000/ipu/android-share.git

Conflicts:
display-client/assets/mobile-action.xml