Merge pull request #1 from mozilla/develop

F.M.O - Default Version (without Bootstrap)
(EOY 2014 Version)
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Updated totalizer.json and switched to static version totalizer.
fix merge conflict