Initial commit
added last version files
Removed settings.py
Added settings.oy to gitignore
Merge branch 'master' of github.com:ellisonleao/puuublic

Conflicts:
	.gitignore
	README.md
	core/models.py
	deploy/fabfile.py
	deploy/requeriments.txt
	friendship/admin.py
	friendship/forms.py
	friendship/models.py
	friendship/tests/test_form.py
	publication/admin.py
	publication/forms.py
	publication/managers.py
	publication/models.py
	publication/templates/publication/publication_detail.html
	publication/templates/publication/publication_form.html
	publication/templates/publication/theme_form.html
	publication/urls.py
	publication/views.py
	puuublic/urls.py
	templates/404.html
	templates/500.html
	templates/base.html
	templates/paginator.html
	templates/users/password_reset_confirm.html
	templates/users/signup.html
	website/forms.py
	website/templates/website/contact.html
	website/templates/website/institucional.html
	website/templates/website/publications.html
	website/templates/website/publications_user.html
	website/templates/website/success.html
	website/templates/website/termos.html
	website/templatetags/default_image.py
	website/urls.py
	website/views.py