update autoreg for PKU
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops

Conflicts:
	named-data/nfd_v0.2.0_rc1.1/etc_default/nfd-autoreg.pku
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops
Merge branch 'master' of http://github.com/WU-ARL/ndn-ops