fixed the bug when using backpressed
added so we store branches that the user don't want to follow
if you have no internet connection and press cancel you now is redirected to settings
Merge branch 'master' into tempMerge