Merge branch 'master' of github.com:edx/edx-platform into fix/cdodge/bad-link-in-activation-email
Merge pull request #31 from edx/nate/edx-platform-ruby-gemset

Change Ruby gemset to edx-platform
Merge pull request #26 from edx/jtauber/fix-overview

small tweaks to overview doc
Install steps - Add numpy requirement in manual installation steps

When `pip install -r requirements/edx/pre.txt` is omitted before running
`pip install -r requirements/edx/base.txt`, it would cause API versions
mistmatch when `make cms` is run. `make cms` would automatically run pip
with pre.txt and install a different version of numpy, *after* base.txt
and post.txt have been run through pip.
Install steps - Fixes mysql package name dependency for Debian/Ubuntu

There is no package called `mysql` in Debian/Ubuntu - instead, MySQL is
split into `mysql-client` and `mysql-server`.

Also deeted duplicate package name.
Install steps - Use "Linux" instead of distribution name to detect OS
Install steps - Fixed typo for installation of rvm on Linux
Code review feedback.
Install steps - Fixes syntax of `update_templates` django command
Merge pull request #11 from edx/feature/christina/metadata-ui

Feature/christina/metadata ui
Install steps - Use edx-platform gemset when fetching ruby deps
Merge pull request #34 from antoviaque/install-requirements-pre

Install steps - Add numpy requirement in manual installation steps
add simple check on whether the expected advanced modules appear in the edit unit page when turned on
remove unused import reference
add simple content check for the activation page when the user is not logged in
hides latex compiler in settings tab by making previously specific css sibling selector general enough to find and hide the appropriate div
Merge pull request #18 from edx/fix/cdodge/bad-link-in-activation-email

[STUD-177] Fix/cdodge/bad link in activation page
add peer grading to the advanced components check
Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration

Added videoalpha to advanced components in component.py file.
Merge pull request #39 from edx/fix/marco/studio-latex-compiler

hides latex compiler in settings tab by making previously specific css s...