new DB SQL dump
conflicts resolved
Merge branch 'olavin-develop' into develop