Olimex MOD-IO
Merge branch 'master' of https://github.com/una1veritas/Workspace

Conflicts:
	MOD-IO_I2C-Slave_v1.02/API support files/MOD_IO.c
	MOD-IO_I2C-Slave_v1.02/API support files/MOD_IO.h
	MOD-IO_I2C-Slave_v1.02/API support files/README.txt
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/AnalogINs.c
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/AnalogINs.h
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/BSP.h
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/DemoSoft.aps
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/DemoSoft.c
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/DigitalINs.c
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/DigitalINs.h
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/DigitalOUTs.c
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/DigitalOUTs.h
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/I2CAddress.c
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/I2CAddress.h
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/I2C_FSM.c
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/I2C_FSM.h
	MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/demosoft.aws
	MOD-IO_I2C-Slave_v1.02/README.txt

	modified:   ArduinoLibraries/.project
	modified:   MOD-IO_I2C-Slave_v1.02/Project_avrStudio4/demosoft.aws