zhxd2/tripal @ 1e0095dbe930322d35f30c80c9d11f0caaea763c

Stephen Ficklin 424f23fb54 Merge branch '7.x-3.x' of github.com:tripal/tripal into 7.x-3.x		%!s(int64=8) %!d(string=hai) anos
..
sbo__relationship.inc	94788d00a1 Fixed bug in relationship settings form	%!s(int64=8) %!d(string=hai) anos
sbo__relationship_formatter.inc	22352356f4 Finished up relsationship pager	%!s(int64=8) %!d(string=hai) anos
sbo__relationship_widget.inc	020eed8650 Fixed bug with missing settings in the relationship field	%!s(int64=8) %!d(string=hai) anos