merge name convension
Merge branch 'last_good_pet'

Conflicts:
	example/pet/pet_init.hpp
	example/pet/pet_move.hpp