...
Merge branch 'master' of https://github.com/chrisland/jsonBuilder

Conflicts:

app/release/releases/jsonBuilder/mac/jsonBuilder.app/Contents/Resources/
app.nw/css/style.min.css

app/release/releases/jsonBuilder/mac/jsonBuilder.app/Contents/Resources/
app.nw/js/main.min.js