add ability to delete comments on responses in discussions.
Adding XML into to individual problem types
Merge pull request #2 from edx/master

update
Converting Time module to JS.
Fix bug multiple choice with video. BLD-788.

The Video element contains an input with type file. When the
Check button was clicked for the multiple choice problem, the
code was acting in different ways when there as a Video on the
page and when there wasn't. This is because in the check_fd()
method there was a selector that was looking for inputs of type
file on the whole page instead of just in the current problem.
When there was a Video pn the page, the page-wide selector
returned the Video's file input, and the check_fd() method
went on believing that the multiple choice has a file input.

The correct way is to look for file inputs only in the current
element.

Added a Jasmine JavaScript unit test.

BLD-788.
basicly finish a array of mobile restfull api
Merge pull request #2618 from edx/valera/fix_multiple_choice_video

Fix bug multiple choice with video. BLD-788.
Remove SSL Certifcate auth reliance on internal password
Use new setting for LMS deadline display instead TIME_ZONE
Merge pull request #2676 from edx/jbau/timezone-hotfix

Use new setting for LMS deadline display instead TIME_ZONE
Make bok-choy correctly publish units with children
Implement children for pure XBlocks in edx-platform

This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
Review fixes
Merge pull request #2602 from cpennington/xblock-acid-child-tests

Add tests of the frontend children api using the AcidXBlock
Merge branch 'release'

Conflicts:
	lms/templates/courseware/accordion.html
Documentation updates to add missing fields and verify descriptions of existing fields for discussion data
Merge pull request #2679 from edx/ahodges/documentation/discussiondata

Ahodges/documentation/discussiondata
More edits from Sarina, results of testing

acct activation required; discussion and wiki posts. Added
cross-reference and info on executing tests when viewing a live course
Edits from Ruth, change log & index updates
Merge pull request #2673 from edx/ahodges/documentation/betatesting2

Ahodges/documentation/betatesting2