bug fix in newBranch
modification in dev branch
conflict modification
Merge branch 'master' of github.com:Angelof7/DocumentManager
merge with remote