Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt

Remove pystache in favor of our custom version

ensuring pystache>=0.5.2

updating dependencies for pystache, networkx, graphviz and removing redu...

updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles

- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg

Made save buttons blue, finished remaining askbot bugs, and removed all instances of $mit-red

Kimth/textbook

Keep each course's descriptors separate

Bridger/feature/clean up

moving all requirements that use a repo to repo-requirements.txt includi...

Conflicts:
	requirements.txt

Feature/kfiedler/courseware style