Merge branch 'master' of git.irl.cs.ucla.edu:/ndn/sync-demo