Uncommented IDS
Merge branch 'master' of github.com:petrs/WSNProtectLayer
Fixed conflict in makefile