add channels, filters, nick tokens; syncing from develop
merge pull problems
sync from develop & fix merge issue