Merge branches 'development' and 'master' of ssh://bitbucket.org/unsignedzero/gojs into development