improved img replacement regex
Merge branch 'master' into wellcome
updated submodules