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
precompiled assets
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into deployment
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy