some changes in neditable
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ninja_ide/core/file_handling/nfile.py
Merge pull request #1373 from diegosarmentero/master

some changes in neditable