Merged channel-tests into origin/develop

...etchat-channel-settings/client/views/channelSettings.html

...-notifications/client/views/pushNotificationsFlexTab.html

tests/pageobjects/flex-tab.page.js

tests/pageobjects/main-content.page.js

tests/pageobjects/side-nav.page.js

tests/steps/3-basic-usage.js

tests/steps/4-resolutions.js

tests/steps/5-emoji.js

tests/steps/6-channel.js

tests/test-data/channel.js

tests/test-data/interactions.js

tests/test-data/user.js