Animate graphs
Merge branch 'master' into observation_map
Style improvements
Merge branch 'master' into observation_map

Conflicts:
	source/Main.js