マージのため
Merge branch 'master' of https://github.com/MetroCover/MetroCover

Conflicts:
	AndroidManifest.xml
	res/values-ja/strings.xml
	res/values/strings.xml
	src/metro/k/cover/lock/LockLayout.java