Added .gitignore_global
Added difftool and mergetool sourcetree and added global gitignore to .gitconfig
Merge branch 'develop'