1. improved comamnd line editor
2. unified Dropbox conflict script
3. added script for Sublime Text on command line