out of sync
Merge branch 'dev' of https://github.com/AlexanderWiniger/rpi_iot into dev

Conflicts:
	rpi_iot/drivers/nrf24l01/gpiodummy.py
	rpi_iot/utils/cmdparse.py