Fix mergebug in pktdump
Merge branch 'master' of github.com:cn-uofbasel/ccn-lite

Conflicts:
	util/ccn-lite-pktdump.c
Remove Warnings
Remove all warnings of clang
enable Werror
Fix reference problem in kernelmod
Ignoring error on deprecation warning in BSDmakefile and util/Makefile
Unified BSDmakefile and Makefile
- removed BSDmakefile
- conditionally configure flags for Linux/OSX, NFN and NACKS
Update lxmod
Changed CLFAG name so that kernel modoule compiles again
fixed conflict
removed util/BSDmakefile, Makefile works for OSX
Refactoring and comments in makefile
removed Makefile from Makefile
Add count num of params functions and comments
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into nfn_callbyname_engine