Building group
Merge branch 'master' of https://github.com/kurisaki/KlwdBrd

Conflicts:
	AndroidManifest.xml