Merge with master

cache_toolbox/COPYING

cache_toolbox/README.rst

cache_toolbox/__init__.py

cache_toolbox/app_settings.py

cache_toolbox/core.py

cache_toolbox/middleware.py

cache_toolbox/model.py

cache_toolbox/relation.py

cache_toolbox/templatetags/__init__.py

cache_toolbox/templatetags/cache_toolbox.py

courseware/content_parser.py

courseware/models.py

courseware/views.py

settings.py

student/models.py

student/views.py

track/views.py