Stephen Ficklin 7739c32661 Fixed merge conflict %!s(int64=7) %!d(string=hai) anos
..
remote__data.inc 7739c32661 Fixed merge conflict %!s(int64=7) %!d(string=hai) anos
remote__data_formatter.inc 04c747ed22 Updated remote__data field... Also some other fixes that got tagged along after merging %!s(int64=7) %!d(string=hai) anos
remote__data_widget.inc cdbf0732c2 initial cross site field implementation %!s(int64=7) %!d(string=hai) anos