Updated dump files + removed my stuff
Merge branch 'dev' into webapp