Merge branch 'master' of https://github.com/barriquello/iotstack

Conflicts:
	README.md
Merge branch 'master' of https://github.com/barriquello/iotstack