Merge branch 'feature/git-branch-prompt' into develop
Added rclotet theme