adding back special code for ignoring nested editables
Merge branch 'editing' into editing-aloha-fix

Conflicts:
src/scripts/helpers/backbone/views/editable.coffee
Merge branch 'editing' into editing-aloha-fix

Conflicts:
	src/scripts/helpers/backbone/views/editable.coffee
Merge pull request #419 from Connexions/editing-aloha-fix

EDITING: add back special code for ignoring nested editables