Merge remote-tracking branch 'origin/edx-west/release-candidate-20130927' into edx-west/release-candidate-20130927
Merge branch 'release'
fix ICE legend, add space to "offensive" checkbox, and fix undo
backing out undo button until coffescript is tested more
more instances of replacing the word 'certificate'
Stanford paid course registration

With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
Stanford paid course registration

With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes

Conflicts:

	common/djangoapps/course_modes/models.py
	common/djangoapps/course_modes/tests/test_models.py
	common/djangoapps/student/views.py
	lms/envs/common.py
Merge pull request #1122 from edx/usman/lms1167-pdfjs-update

PdfViewer: Added missing link to compatibility.js
Merge pull request #1005 from edx/jtauber/link-to-how-to-contribute

Include / Link to How To Contribute wiki page
update discussion forum doc
Merge pull request #1143 from edx/will/skip-tests-with-comments

Use comments to skip tests instead of a tag
First caption does not display outline on initial mouseover.
Merge pull request #1118 from edx/jbau/shoppingcart-stanford

Stanford paid course registration
fix the bug that the first caption and the second one will become current at the same time when displaying right captions
fix the bug: when click a caption, the previous one will be in bold
fix the video caption lag issue
Add a management command to dump xml courses

This command loads the courses with the XMLModuleStore, and then exports
the fields contents as json in a diff-friendly way. This can then be
used to validate against regressions in the xml parsing code.
Make sure that we have the right set of fields available during xml parsing

We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.

The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
Merge pull request #1119 from cheng-shiwen/cheng-shiwen/master

caption display problem
Make discussion elements change color on focus

Previously, colors changed to afford interaction only on hover; now, all
elements with a hover color change behave the same way on focus.