Fix orm reference
package.json juggling for npm link
Merge remote-tracking branch 'upstream/master'
add primary and foreign key