Merged ccn-core and krivine form nfn_merge branch because whitespace was modified in the local repo at some point
merged ccnl-core and krivine again, still modified whitespace