activity and host ordering
Merge branch 'master' of github.com:paulovillani/camprulho

Conflicts:
	portal/templates/accommodation_search.html
Merge branch 'master' of github.com:paulovillani/camprulho

Conflicts:
	portal/class_views.py