file upload for loadJSON()
r4-1-load-JSON prepared to be finished
Merge branch 'r4-1-upload-json' into develop

Conflicts:
	app/index.html
update index.html after merge conflicts