Merge branch 'trunk' of https://github.com/voer-platform/vpw

* 'trunk' of https://github.com/voer-platform/vpw:
  Guideline for upload file

Conflicts:
	locale/en/LC_MESSAGES/django.mo
	locale/en/LC_MESSAGES/django.po
	locale/vi/LC_MESSAGES/django.mo
	locale/vi/LC_MESSAGES/django.po
Merge branch 'trunk' of https://github.com/voer-platform/vpw

* 'trunk' of https://github.com/voer-platform/vpw: