Merge branch 'lessonplan' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'deployment' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Ensure that users can only see the workbin for missions and trainings they can access.
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment

Conflicts:
	app/models/course.rb
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Not supposed to apply the container class to content divs. Only to top-level divs.
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment

Conflicts:
	app/views/materials/index.html.erb