Merge branch 'master' into updates-staging

Conflicts:
	conf/locale/eo/LC_MESSAGES/django.mo
	conf/locale/eo/LC_MESSAGES/django.po
	conf/locale/eo/LC_MESSAGES/djangojs.mo
	conf/locale/eo/LC_MESSAGES/djangojs.po
	conf/locale/es_419/LC_MESSAGES/django.mo
	conf/locale/es_419/LC_MESSAGES/django.po
	conf/locale/es_419/LC_MESSAGES/djangojs.mo
	conf/locale/es_419/LC_MESSAGES/djangojs.po
	lms/envs/aws.py
	lms/envs/common.py
	requirements/edx/base.txt
Draft of mobile FAQ for students
Draft of mobile FAQ
Draft of mobile FAQ
Revisions to mobile FAQ for students
Update app post name and course list
Add 'we'll be adding more courses' text
Tweak demo course description
Add line breaks
set overflow to scroll so that user can see full content with increased font size
TNL-256
image files with different extensions should generate thumbnails with distinct names (TNL-532)
Add MIT and Delft courses to available course list
Changing default donation amount
Making the header width fixed until we have responsive design.
Merge pull request #5546 from edx/sanchez/update_default_donation_amount

Changing default donation amount
Merge pull request #5549 from edx/sanchez/increase-min-header-width

Making the header width fixed until we have responsive design.
Fix doc formatting.
fix tracking log entry key child-id -> child_id
Stop page extending out of viewport width by 40px

Currently the .container and .wrapper-footer elements are set to 100%,
and also have horizontal padding added to them. This results in a total
width of greater than the full width of the viewport; This causing the
browser to scroll horizonally into empty space, regardless of how wide
the viewport is.

I had added the `box-sizing: border-box` to these elements in order to
resolve this.

Cheers,
Louis
Add Louis Pilfold to AUTHORS