城。とりあえず実装
Merge branch 'master' of https://github.com/maeda1150/QchanApp

Conflicts:
	QchanApp/AndroidManifest.xml