JSON-Simple License
Add /dist/ to the .gitignore
Merge master into assets