Merge pull request #169 from piyushbansal/master

[Fixed] Support votes for a proposal
Support votes modification
Merge branch 'master' of git://github.com/cidadania/e-cidadania

Conflicts:
	src/apps/ecidadania/proposals/views/common.py
Fixed git merge errors
Merge pull request #170 from piyushbansal/master

A minor bug in voting module
Fixed #7: Proposalset list shows all sets. Fixed old iconset or edit and
delete in the list
Fixed #12 Validation for PDF uploads. Relocated and updated the list of
allowed content types to conteplate more use cases.
Fixed #24 Included has_space_permission in the imports
Modified view for edit debnate and added edit funtion to space template
Fix #28 change querysets for proposals and proposalsets
Fixed #19 replacing url by get_absolute_url method
Minor checks around ticket #18
Fixed bug in overview tab that didn't work. Fixed list in create new
proposal that listed all the proposalsets in the platform.
Minor fixes and fixed #11 wrong vote validation. It was caused by an url
Ticket #25 Solved
Support vote count not being displayed Solved
Merge pull request #171 from VishrutMehta/master

[Fixed]Ticket #25, Support votes not being displayed
Added Travis CI file and removed django from requirements.txt.
Moved travis file to project root
Moved travis file and updated it for the new location