Stashed changes
Merge branch 'master' of ssh://github.com/travisdesell/wildlife_at_home

Conflicts:
	client/CMakeLists.txt
Merge branch 'master' of ssh://github.com/travisdesell/wildlife_at_home

Conflicts:
	client/CMakeLists.txt
Merge branch 'master' of ssh://github.com/travisdesell/wildlife_at_home

Conflicts:
	client/wildlife_surf.cpp
	undvc_common
Merge branch 'master' of ssh://github.com/travisdesell/wildlife_at_home

Conflicts:
	client/CMakeLists.txt
	client/wildlife_surf.cpp
	undvc_common