Bug fixes and new json file
Merge branch 'master' of https://github.com/adamcunnington/LIFOrganiser