Re-formated code. No change in code itself
Format changes
Merge branch 'master' of http://github.com/j-harrison/JsonEditor

Conflicts:
	.idea/.name
	.idea/modules.xml
	.idea/workspace.xml
	js/myApp.js
Transclusion changes
JSON schema validation
JSON schema validation
xml
Merging issues resolved
file path fix