Fixed logging format in Occi::*

Includes updated Occi::Infrastructure::Network* classes
with refactored mixin adding/removing (related to logging).
Merge pull request #46 from arax/logger_fix

Fixed logging format in Occi::*
Fixed merge in Occi::Collection
Fixed header parsing in Occi::Parser
Merge pull request #47 from arax/parser_fix2

Occi::Parser fix -- headers
Merge branch 'master' into specupdate

Conflicts:
	lib/occi/collection.rb