Merge branches 'feature-title' and 'master' of https://github.com/fujitaya/Zunko

Conflicts:
	app/src/main/java/jp/fujitaya/zunko/util/GameView.java