fixed some js and a cms label
Merge branch 'master' of git://github.com/StudentLifeMarketingAndDesign/division-project