update Makefile
update Makefile
update locale
pull develop