removing git stuff
Merge branch 'dev' into release-157