Explain the comment out.
Merge branch '3215' of github.com:openscholar/openscholar into 3215
Adding the inline entity form to the make file.
Fix conflict.