Merge pull request #33 from ChinosInternationalCC/master

last updates from chino repo
indicate editor mode
Merge pull request #128 from ovicin/master

indicate editor mode