Changed carousel to new owl 2.0 version.
fixed merge conflict
updated owl carousel