first prod
prod ora and forum
Merge remote-tracking branch 'origin/prod'

Conflicts:
	.gitignore
	app/edxapp/edx-platform/cms/lib/xblock/mixin.py
	app/edxapp/edx-platform/common/djangoapps/dark_lang/middleware.py
	app/edxapp/edx-platform/common/djangoapps/edxmako/paths.py
	app/edxapp/edx-platform/common/djangoapps/student/views.py

app/edxapp/edx-platform/common/microsite/default/templates/courseware/co
urse_about.html

app/edxapp/edx-platform/common/microsite/default/templates/theme-footer.
html

app/edxapp/edx-platform/common/microsite/default/templates/theme-head-ex
tra.html

app/edxapp/edx-platform/common/microsite/default/templates/theme-header.
html

app/edxapp/edx-platform/common/microsite/fbmx/templates/courseware/cours
e_about.html

app/edxapp/edx-platform/common/microsite/fbmx/templates/theme-footer.htm
l

app/edxapp/edx-platform/common/microsite/hec/templates/courseware/course
_about.html

app/edxapp/edx-platform/common/microsite/hec/templates/theme-footer.html

app/edxapp/edx-platform/common/microsite/hec/templates/theme-head-extra.
html

app/edxapp/edx-platform/common/microsite/moocjournalisme/templates/cours
eware/course_about.html

app/edxapp/edx-platform/common/microsite/moocjournalisme/templates/theme
-footer.html

app/edxapp/edx-platform/common/microsite/moocjournalisme/templates/theme
-head-extra.html

app/edxapp/edx-platform/common/microsite/mycompany/templates/courseware/
course_about.html

app/edxapp/edx-platform/common/microsite/mycompany/templates/theme-foote
r.html

app/edxapp/edx-platform/common/microsite/mycompany/templates/theme-head-
extra.html

app/edxapp/edx-platform/common/microsite/socgen/templates/courseware/cou
rse_about.html

app/edxapp/edx-platform/common/microsite/socgen/templates/theme-footer.h
tml

app/edxapp/edx-platform/common/microsite/socgen/templates/theme-head-ext
ra.html
	app/edxapp/edx-platform/lms/templates/courseware/course_about.html
	app/edxapp/themes/fbmx/static/css/main.css
	app/edxapp/themes/fbmx/templates/courseware/course_about.html
	app/edxapp/themes/fbmx/templates/courseware/courseware.html
	app/edxapp/themes/fbmx/templates/courseware/info.html
	app/edxapp/themes/fbmx/templates/courseware/progress.html
	app/edxapp/themes/fbmx/templates/courseware/xqa_interface.html
	app/edxapp/themes/fbmx/templates/login.html
	app/edxapp/themes/fbmx/templates/register.html

app/edxapp/themes/fbmx/templates/registration/password_reset_complete.ht
ml

app/edxapp/themes/fbmx/templates/registration/password_reset_confirm.htm
l
	app/edxapp/themes/fbmx/templates/registration/password_reset_email.html
	app/edxapp/themes/fbmx/templates/static_templates/theme-contact.html
	app/edxapp/themes/fbmx/templates/static_templates/theme-honor.html
	app/edxapp/themes/fbmx/templates/static_templates/theme-tos.html
	app/edxapp/themes/fbmx/templates/theme-footer.html
	app/edxapp/themes/fbmx/templates/theme-head-extra.html
	app/edxapp/themes/fbmx/templates/theme-header.html
	app/edxapp/venvs/edxapp/lib/python2.7/site-packages/mako/lookup.py
	app/nginx/sites-available/lms
	var/edxapp/staticfiles/themes/fbmx/css/main.css
	var/edxapp/staticfiles/themes/moocjournalisme/css/main.css
	var/edxapp/staticfiles/themes/mycompany/css/main.css
	var/edxapp/staticfiles/themes/socgen/css/main.css