Merge remote-tracking branch 'origin/master' into osx
Merge branch 'master' into osx

Conflicts:
	sample/makefile
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
fixed OSX install scripts
Merge branch 'master' into osx

Conflicts:
	sample/makefile
	sample/xbee1/11.uart_test/makefile