Merge remote-tracking branch 'origin/20130928_line_tracking_2.0'
Merge branch 'master' into rpi_nxt