launch fixes
Merge branch 'master' of https://github.com/GKIFreiburg/gki_robots

Conflicts:
	gki_turtlebot/gki_turtlebot_bringup/launch/laser.launch