Merge pull request #168 from MITx/multicourse_wiki

common/lib/xmodule/xmodule/course_module.py

lms/djangoapps/courseware/courses.py

lms/djangoapps/simplewiki/admin.py

lms/djangoapps/simplewiki/mdx_circuit.py

lms/djangoapps/simplewiki/mdx_wikipath.py

lms/djangoapps/simplewiki/migrations/0001_initial.py

lms/djangoapps/simplewiki/migrations/0002_unique_slugs.py

...ace__del_field_article_parent__add_field_article_names.py

.../simplewiki/migrations/0004_multicourse_data_migration.py

...lewiki/migrations/0005_auto__add_unique_namespace_name.py

lms/djangoapps/simplewiki/migrations/0006_auto.py

lms/djangoapps/simplewiki/migrations/__init__.py

lms/djangoapps/simplewiki/models copy.py

lms/djangoapps/simplewiki/models.py

lms/djangoapps/simplewiki/urls.py

lms/djangoapps/simplewiki/views copy.py

lms/djangoapps/simplewiki/views.py

lms/static/js/simplewiki-AutoSuggest_c_2.0.js

lms/static/js/vendor/CodeMirror/codemirror.css

lms/static/js/vendor/CodeMirror/codemirror.js