added jquery
added ng animate
resolved merge conflicts