Cherry-picked commits from merged_with_master_fixes

Conflicts:
	cms/djangoapps/contentstore/views/item.py
baby steps
baby steps2
ID's system is changed, node adding works, edge adding is yet to be fixed
Looks like I fixed edge adding, for Azatoth's sake.