Merge demo 2
Merge branch 'master' of https://github.com/ImmersiveSystems/net-robo

Conflicts:
	arduino/dagu_wild_thumper/Wild_Thumper_Controller/Wild_Thumper_Controller.ino