Added @property to class documentation for every fk relationship to help IDEs
Removed unnecessary fully qualified name for certain classes in @property section of class doc.
Merge branch 'master' into custom