Updated db and static/images from live site
resolving merge conflict over db