epedev-426

Add 2 fields, Investigation Level and and Teaching Mode to LLB
structure, edit view and instructor note page
Revert "epedev-426"

This reverts commit a3db6bb2f7a9586357e0836e66a31814f2fa4b7f.
epedev-426

add 2 fields, teaching mode and investigation level to structure, edit
form and instructor node page
move update files' new field definition to main field_base and
field_instance include to prep for eventual code clean up
epedev-426

add keyword taxonomy term field to LLB structure, edit form and
instructor view page
merge in epedev-426

merge in epedev-426 to fix conflict.  both branch declares update 7008