上書き
Merge remote-tracking branch 'origin/develop' into feature-update

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	res/layout/activity_fullscreen.xml
Merge pull request #1 from uizusui/feature-update

Feature update