Changes in serial from Antti
Merge remote-tracking branch 'origin/master'

Conflicts:
	2014/conf1
	2014/src/RobotLogic.cpp
	2014/src/Starter.cpp
	Vconf1/conf1
	Vconf1/vconf