adapting some aliases
adding sourcetree in gitconfig
adding horizontal bubbling
checkout master in submodules
Merge branch 'feature/adapting' into develop