Fixes vertical alignment of gallery items
Cleaned up code
Cleaned up code
Adds analysis object
start doing the analysis tool
store stories state in the url as a filter
fix zoom and some escaped 580
Merge branch 'analysis' into nofilter

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/helpers.js
	app/assets/stylesheets/application.css.scss
	lib/assets/javascripts/gfw/gfw.js
Adds timeline
refresh sprite
analysis tool, wip
Merge branch 'master' into nofilter
Adds tipsy
Adds range
Resize range
Adds play events
analysis tool; pending clear, subscription and countries
Removed "Other sites" section
Adds cartodb_config sample file
add pending images