Merge branch 'master' of https://github.com/artekw/arduino

Conflicts:
	sensnode/sensnodetx/configuration.h
	sensnode/sensnodetx/sensnodetx.ino