Fix Makefile
Merge branch 'dev-master' of github.com:cn-uofbasel/ccn-lite into dev-master
Fix compiler bug