Merge branch 'develop' into luke/new-guest-access-set-mxid-2

.gitignore

CHANGELOG.md

README.md

config.sample.json

electron/img/riot.ico

electron/img/riot.png

electron_app/build/icon.icns

electron_app/build/icon.ico

electron_app/build/icons/128x128.png

electron_app/build/icons/16x16.png

electron_app/build/icons/24x24.png

electron_app/build/icons/256x256.png

electron_app/build/icons/48x48.png

electron_app/build/icons/512x512.png

electron_app/build/icons/64x64.png

electron_app/build/icons/96x96.png

electron_app/build/install-spinner.gif

electron_app/img/riot.ico

electron_app/img/riot.png

electron_app/package.json