versao django==1.6
Merge branch 'master' of https://github.com/edersonbrilhante/ocupa-ufpel

Conflicts:
	ocupa/__init__.pyc
	ocupa/admin.py
	ocupa/admin.pyc
	ocupa/models.pyc
	ocupa/urls.py
	ocupa/urls.pyc
	ocupa/views.py
	ocupa/views.pyc
	ufpel/__init__.pyc
	ufpel/settings.py
	ufpel/settings.pyc
	ufpel/urls.py
	ufpel/urls.pyc
	ufpel/wsgi.py
	ufpel/wsgi.pyc
ajustes de conflitos