split create_item and create_child out as separate methods
Merge pull request #4488 from edx/christina/ispublic

ispublic is in active use by Stanford.
Merge pull request #4381 from edx/nimisha/split-converge-api

Nimisha/split converge api
Studio: corrects new course field tip copy to reflect what provided course values cannot be changed later
STUD-2001
Don't update ancestors while bulk editing.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
ignore MAC meta files on import and also remove any such files from the course
STUD-1725
Merge pull request #4025 from edx/zub/bugfix/std1725-duplicatefilesonimport

ignore MAC meta files on import and also remove any such files from the ...
Merge pull request #4493 from edx/studio/bulk-edit-dont-update-ancestors

Don't update ancestors while bulk editing.
Updating the ORA2 hash for July 21st, 2014
removed the discount value bug

check error handling if the discount value is not an integer
Merge remote-tracking branch 'origin/release' into rc/2014-07-16

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
Fix unicode issue
Add course author notes for 7/16 release
Merge pull request #4484 from edx/talbs/fix-new-course-copy

Studio: New Course Field Tip Copy Correction
Merge pull request #4433 from edx/sylvia/docs/rel_notes_7_16

Add course author notes for 7/16 release
Merge pull request #4495 from edx/ora2/release-2014-07-21T12.20

Updating the ORA2 hash for July 21st, 2014
resolving merge conflicts
Merge pull request #4179 from IONISx/tusbar/remove-course-id-from-title

Remove course ID from title in course about page
Added item for Studio URL changes
Merge pull request #4503 from edx/markhoeber-release-notes-studio-urls

Added item for Studio URL changes to Release Notes