Merge branch 'master' into Saumya
commented removal of jcarousel