added basic hooks and controller classes
resolved merge conflict after merge
basic entity integration working, fields in hook_install