Save sesion as JSON with all the information
Merge remote-tracking branch 'upstream/master'