Updated links to #login-modal to Stanford login page #1120
Merge branch 'master' of https://github.com/Stanford-Online/class2go into shali-fixes
Add repopulateForm function for pulling up old data

	modified:   templates/exams/view_exam.html
Merge pull request #1181 from Stanford-Online/dca_working

Fix for #1180 (pull to prod)
Fix resize audio by distributing our own ffmpeg (#1177)

I built my own version of ffmpeg that would include libx264.  Just
manually distributing this now and bashing into /usr/local/bin.

Since now we're using ffmpeg on both mac and linux no need to do
complicated container muxing (yuck) or per-platform options (yuck).  So
that's all ripped out in this change.
readme file for building ffmpeg (#1177)
Small changes on readme (#1177)
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises
Merge branch 'master' of https://github.com/Stanford-Online/class2go into wescott-master-c2g-exercises
initial commit for exam csv
Tighten Course Materials layout (Issue #355)

	modified:   c2g/static/css/core/body.css
	modified:   templates/problemsets/ready/problemset_list_item.html
	modified:   templates/videos/ready/video_list_item.html
get rid of "exams" from topnav when there are none
Reduce space between content list items, add wells

Issue #355

	modified:   c2g/static/css/core/body.css
	modified:   templates/content_sections/ready/section.html
Merge pull request #1201 from Stanford-Online/wescott-master-c2g-exercises

Wescott master c2g exercises
Merge pull request #1198 from Stanford-Online/jinpa-work

get rid of "exams" from topnav when there are none #1191
Merge pull request #1187 from Stanford-Online/sef-sprint-19-video

Fix resize audio by distributing our own ffmpeg (#1177) (to master)
Commit1 for #1132 - adding exercises.
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working
More for #1132
Fix for #1204