modifs
OctoMerge branch 'robinch' of github.com:7Robot/EUR_2014_asserv into robinch

Conflicts:
	EUR_2014_asserv.X/main.c
	EUR_2014_asserv.X/user-interrupt.c