Support votes modification
Merge branch 'master' of git://github.com/cidadania/e-cidadania

Conflicts:
	src/apps/ecidadania/proposals/views/common.py