Conflicts:
	cms/templates/widgets/header.html
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/tests/test_courses.py

Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee

Giulio/peer grading style release

update create-dev-env.sh, change one small character

Feature/jkarni/jsinput

Disabled tests that are failing in Jenkins

in line 470, changed "curl -O" to "curl -OL" such that the scripts runs without problems.

Ignore Pylint R0921

[STUD-380] Fix/cdodge/delete course delete drafts

Add setting to set the virtual host of a Celery broker

Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py

Fix broken tests by simplifying the CourseFactory

The data argument was being treated specially, but that was just
because we didn't have **kwargs support.  Now we do.  There are
two uses of data=, one we convert to kwargs, the other was actually
unused, so remove it completely.

remove unnecessary type check on the module store. XML module stores will throw an exception when deleting an item...

Pylintrc changes to improve things, including removing the reports.

Fix LMS-530: Reflected XSS in chapter and page numbers

Pylint errors

Made a css_html to obtain the html of the css element.

add a 'can_execute_unsafe_code' callback method (ala LMS) to allow for w...