Add new .git-prompt.sh and include it in .bash_prompt
merge master back to develop
Merge branch 'hotfix/remove_diff_function' into develop

* hotfix/remove_diff_function:
  remove diff function - if I want git diff I'll type 'git diff'
Usel ight background in gvim
Merge branch 'develop'

* develop:
  Usel ight background in gvim
  Add new .git-prompt.sh and include it in .bash_prompt