fix deploy script after merge
fix deploy script after merge
update locale for vi after install django-blog-zinnia
Merge branch 'translate-vi' into develop