updating layout files, adding a couple of .json files
Merge remote-tracking branch 'remotes/origin/master'