Just a start on using JSON to save favorites
Merge remote-tracking branch 'origin/master'