slam
Merge branch 'master' of https://github.com/RockRobo/Robot
Merge branch 'master' of https://github.com/RockRobo/Robot

Conflicts:
	Yingnan/gmapping/Configuration.cpp