Refactored json case to use .json~ extension
Merge branch 'master' of github.com:TeamBugCat/yrs2014