change path to plugin
change prompt for git
Merge branch 'feature/git-prompt' into develop
Merge branch 'release/20130831'