some cleanup in ccn-lite-fetch
updated ccnx test for demo-fetch
Merge branch 'dev-master' of https://github.com/cn-uofbasel/ccn-lite into dev-master
added nonce flag for mkI and increased NFN computation time