fix vcs_modified
fix vcs_others
fix vcs_staged
add stash list
Merge remote-tracking branch 'origin/master'