lixo
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot

Conflicts:
	src/com/ipg/jbot/navigation/OdometricLocalizer.java
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot
Merge branch 'master' of https://github.com/IPGTurtleBotG1/turtlebot
merge