major bug
faster sorting solution
removed an unnecessary function
Merge branch 'master' of git://github.com/piyushbansal/e-cidadania into piyushbansal-master

Conflicts:
	src/core/spaces/views/spaces.py
Fix indenting