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
Adjust condition for return link.
Merge pull request #776 from wangguan59/back_page

Back link condition in exercise page
Enable zero-config with a specified admin and username.  Makes for full install on zero-config.
updates to undo unnecessary changes
Added i18n documentation; updated the i18n management command to reflect some changes.
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 branch 'release-0.10' of github.com:learningequality/ka-lite into develop
Merge pull request #786 from dylanjbarth/i18n_hackathon

Added i18n documentation and starting places for Stanford hackathon
Hopefully better docs for hackathoners.
Merge pull request #790 from dylanjbarth/i18n_hackathon

Hopefully better docs for hackathoners.
Hopefully better docs for hackathoners.
Merge branch 'i18n_hackathon' of github.com:dylanjbarth/ka-lite into i18n_hackathon
Merge pull request #791 from dylanjbarth/i18n_hackathon

I18n hackathon