Updates..
Merge branch 'master' of https://github.com/chris-wood/NDNGateway

Conflicts:
	doc/icn2014/icn2014.aux
	doc/icn2014/icn2014.log
	doc/icn2014/icn2014.pdf