Entity reference

Deleted references, added entityreference
Merge branch 'master' of github.com:jlenni/ip_basic