Merge pull request #262 from dionyziz/json_accept_clarify

Change output format if using json
Add gtklocker on README
Merge pull request #273 from VitSalis/add_gtklocker_readme

Add gtklocker on README
Merge branch 'master' into game_json_cli
Merge pull request #276 from VitSalis/game_json_cli

Merge master