Test
Merge branch 'nancyborg-ia2013' of https://github.com/Nancyborg/raspberry into nancyborg-ia2013

Conflicts:
	src/api/asserv/Asserv.java
	src/api/gpio/Gpio.java
	src/ia/common/DetectionSRF10.java
	src/ia/nancyborg2013/Ia.java