Updated planning notes, some details for data search and feed
Merge remote-tracking branch 'upstream/master'