pulling
Merge branch 'master' of github.com:paulovillani/camprulho

Conflicts:
	portal/class_views.py
fix slugs to db fields