Revert "Fixed problem with local and remote tracking branches"

This reverts commit 647061544498ed1fa99c2c032e9670a69a6800a6.
Merge branch 'dev'