rollup

forgot to commit all this stuff end of s1
Merge remote-tracking branch 'origin/master'

Conflicts:
	charts/templates/charts/index.html
	charts/templates/charts/people/detail.html
	requirements.txt