Added support for population plotting.
Fixed merge conflict in index.html