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

Conflicts:
	app/dev/index_grunt.html
	app/live/index.html
	app/live/js/main.min.js

app/release/releases/jsonBuilder/mac/jsonBuilder.app/Contents/Resources/
app.nw/index.html

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