merge conflict
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
reverted datawalk back to January 20
fixing merge conflict ?
Merge pull request #1029 from AlanRosenthal/master

fixing merge conflict on datawalk as a service