Update to have gitignore
Merge branch 'master' of github.com:contiki-os/contiki
Merge branch 'master' of github.com:contiki-os/contiki
Fixes warnings, bad code and code style
Use the Z1 product ID as MAC/Node ID if no value is found in the XMEM
Merge pull request #824 from alignan/fix_warnings

Warning fixes
Merge pull request #820 from alignan/serialnum_as_nodeid

Use the Z1 product ID as MAC/Node ID if no value is found in XMEM
Merge branch 'master' of github:sieben/contiki
dos2unix fix

I've found all the file with windows encoding by using the following
command :

    find . | xargs file | ack-grep "CRLF"

It's better to have only one encoding and since UNIX is the convention
used for core it should also be the one used everywhere else.
Adding a .gitattributes
Merge branch 'dos2unix' of github:sieben/contiki into dos2unix