Adding JSON Template files.
Changing location of the JSONT files in Makefile.
Adding swap files to .gitignore.
Merge branch 'hotfix'
Merge branch 'master' into develop.

Conflicts:
	.gitignore