Merge branches 'master' and 'master' of https://github.com/learningequality/ka-lite into develop

Conflicts:
	README.md
ignore virtualenv generated directories
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop

Conflicts:
	.gitignore
	README.md
Changing version for 0.10.2
Clear any existing user summary from DOM when rendering new graph.

Fix for #622
Fix for #464

When no users exist for Scatter and Timeline coach reports, show an error message instead of drawing an empty chart.
Update scatter and timeline no user error to use standard error communication.
Re-introduce fix that disappeared. Convert facilities in coachreports form data to ids.
Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop
port 'with' statement to try catch clause (ZipFile can't be a context manager yet by 2.6)

Conflicts:
	kalite/utils/platforms.py
use 'finally' clause to ensure zfile.close() is called
Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop
Adding new timelines stats page
Merge pull request #787 from aronasorman/develop

Change 'with' statement in utils/platforms.py to a 'try' clause
YEAH!!!!
Merge pull request #783 from rtibbles/coach_reports_UI_fixes

Various coach report UI fixes
Merge branch 'coach_reports_UI_fixes' of github.com:rtibbles/ka-lite into release-0.10.2
Clean/create logs for 100updates test, include user info
Merge pull request #801 from bcipolli/100updates_update

Clean/create logs for 100updates test, include user info