?
Merge branch 'master' of https://github.com/Saku2/KutsuPlus-android

Conflicts:
	.gitignore
	kutsuplusproject/project.properties