Merge remote-tracking branch 'origin' into eventos

Conflicts:
	portal/core/models.py
	portal/core/templates/core/portal.html
	portal/core/tests/test_views.py
	portal/core/views.py
Criação da app banner
Merge branch 'banner' into develop

Conflicts:
	portal/core/models.py
	portal/core/views.py
	portal/settings.py
	portal/urls.py