Release for May 12, 2014
Merge pull request #3684 from edx/ora2/release-2014-05-12T12.57

Release for May 12, 2014