Adding drag and drop back.
Fixed rename bugs.
Self var added.
Merge remote-tracking branch 'refs/remotes/prglab/master' into prglab-master