amended channel list display in profile.
resolved merge conflicts
empty commit
changes to Profile activity