Resolve local vs. remote data source conflict [1074]
Merge pull request #81 from tommyjasmin/master

Resolve local vs. remote data source conflict [1074]