update todos
Merge remote-tracking branch 'origin/master'

Conflicts:
	_site/dist/js/analytics.js
	_site/dist/js/demo.js
	dist/js/analytics.js
re-minify code for _site