Merge branch 'timeline' of github.com:ChickenFur/HumanImpact into timeline

Conflicts:
	js/client/graph.js
Merge branch 'timeline' into dev

Conflicts:
	coffee/client/graph.coffee
	js/client/graph.js
Merge branch 'dev' of github.com:ChickenFur/HumanImpact into dev

Conflicts:
	coffee/client/graph.coffee
	js/client/graph.js