update develop
fix test
update urls
minor fixed; update locale
pull develop