Commit to merge with team.
Merge remote-tracking branch 'origin/master'

Conflicts:
	IoT GUI/src/iotGUI/IoTGUIApp.scala