channel disply modified
Merge branch 'master' of https://github.com/krtkmj/cubane

Conflicts:
	db.sqlite3