Change voer/__init__.pyc
Merge branch 'trunk' of https://github.com/voer-platform/vpw into trunk

Conflicts:
	voer/settings.py
add trans
Merge branch 'trunk' of https://github.com/voer-platform/vpw into trunk