Upload tag image.
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/assets/tag.png