Rebase 20140926 merged xblock discussion changes

Merged discussion changes, resolved conflicts, fixed broken tests
It's a merge error