change default settings for servers/assets paver tasks from "dev" to "devstack"
Update pavelib.rst and run_devstack.rst  for changes to default settings
Move edit info into xblock and runtime mixins
LMS-11183, LMS-11184
Handle the indexerror exception on create_order
LMS-2646
Implement edit info as mixin for split
LMS-11183, LMS-11184
Merge pull request #4501 from htareque/lti_revision_3

username and email request for lti module
Tweak mongo count numbers
AWS settings for XBlocks to have filesystem-like storage
Merge pull request #5036 from edx/sanchez/fix_django_header_tests

Sanchez/fix django header tests
Merge pull request #4988 from edx/benp/all-tests-update

jenkins scripts: provide 'all' shard for bok-choy, use as default.
Merge pull request #5039 from edx/pmitros/aws-djpyfs

AWS settings for XBlocks to have filesystem-like storage
Merge pull request #5037 from edx/ammar-ben/bok-choy-shard-3

Split bok-choy tests into 3 shards (merge)
Revert "AWS settings for XBlocks to have filesystem-like storage"
Merge pull request #5040 from edx/revert-5039-pmitros/aws-djpyfs

Revert "AWS settings for XBlocks to have filesystem-like storage"
Implement mediated bulk purchase epic

Updating EX-60 logic
Change published_date to published_on
to make consistent with other edit info timestamps
LMS-11184
Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29

Merge hotfix-2014-08-29 to master
Merge pull request #4771 from edx/cdodge/ecommerce-invoicing

Cdodge/ecommerce invoicing
Move tests into appropriate directory structure.
Implement edit info as mixin on base mongo
LMS-11183, LMS-11184