Changed r.js configs
Removed j.html
Pie charts on the map
Merge branch 'production'