Unify indentation
Added .editorconfig file
Merge branch 'master' into raw_json_view

Conflicts:
	index.html