Testing from Outside 1/16. Stuff is broke yo
Merge branch 'master' of https://github.com/cwrucutter/cwrucutter_core

Conflicts:
	cutter_amcl/src/cutter_amcl_new.cpp
	cutter_localization/start_localization.launch
	cutter_survey/survey/snowmap_con1.txt
	cutter_survey/survey/survey_con1.txt