add energy mesurement
fix include of crypto
Merge pull request #80 from mehlis/ccn-lite-follow-up-4

Ccn lite follow up 4