Ticket #237 json export type
Merge branch 'json-export' of github.com:Gankro/EpicEditor into json-export

Conflicts:
	epiceditor/js/epiceditor.min.js