Highlighted Proposals
Spelling Mistakes in usermanual.rst
Displaying date in Highlighted proposals
Merge branch 'master' of git://github.com/tssavita/e-cidadania into tssavita-master

Conflicts:
	src/core/spaces/views/spaces.py
Fixed merge code
Merge branch 'master' of git://github.com/cidadania/e-cidadania