fix square pics on phone
merge conflicts
get back intelmap.js
Merge branch 'master' of https://github.com/davliu/sticky

* 'master' of https://github.com/davliu/sticky:
  udpated seeds and removed reference to trends controller