db and submodule updates
resolved merge
updated db from live site