Merge branch 'hotfix/git-prompt-fix' into develop
change display for git remove diff.
Merge branch 'release/20130901'