changed room color
Merge branch 'master' of github.com:ixmedia/waq into dev-mobile

Conflicts:
	db/app-backup.db