Changed PAN-ID to 0xA070 and IEEE 802.15.4 channel to 25
Merge branch 'master' of https://github.com/mjung85/contiki