subset  completed
Merge branch 'master' of https://github.com/craql/JsonObjectEditor

Conflicts:
	js/JsonObjectEditor.jquery.craydent.js