Added command --db upgrade to bin/openquake
Solved a merge conflict