fixed json bug
Start creating the correct JSON payload
Validate JSON files

Test that all our JSON files are valid. Fix the two files that currently
aren't. Fix #1413
Actually commit the script
Merge pull request #1411 from hawkthorne/upload_release_notes

Generate release notes for Sparkle
Merge pull request #1414 from hawkthorne/add_json_tests

Add json tests
Also check that our XML files are valid too
Run validate on all branches
Merge pull request #1416 from hawkthorne/add_json_tests

Also check that our XML files are valid too
Merge pull request #1402 from DaNiwa/bar_stuck

Fix Stuck behind a bar
If using the --level flag, set the default Gamestate.home

Fixes #1031 and #1287
Merge pull request #1417 from Protuhj/quit_to_menu

If using the --level flag, set the default Gamestate.home variable
Addresses #1031 and #1287
Merge branch 'saving' of https://github.com/Protuhj/hawkthorne-journey into saving
Updating branch
remove random empty file
blank space on file endings
Merge pull request #1361 from CalebJohn/vol-enemies

Mariachi Band!
Killing the player
Merge remote-tracking branch 'origin' into saving

Conflicts:
	src/locales/en-US.json
Merge branch 'master' into valley-redux

Conflicts:
	src/maps/valley.tmx