Development

[mnaamani]

Merge dev into master, primarily because we are starting to use some of the new updates in joystream-node, and this is resulting in travis failing when building the native addon