Merge branch 'develop'
fix linked file indicator
Merge branch 'develop'
change Untracked status color