obi
Merge branch 'dev' of github.com:vstarostenko/soteria into dev

* 'dev' of github.com:vstarostenko/soteria:
  local changes on Victor's
  data folder changes
  More Preprocessing done
wiki changes