Implementing user can see biased news
db em postgresql funcionando
alterando imagem de acompanhar
pagina do perfil do politico ok
adicionando e entendendo os testes
adicionando arquivos
implemented multiple feeds
implemented news source
many to many news
Merge branch 'master' into implement_multiple_feeds
new fixture with migrated data
integrando scripts de popular o banco de dados com partidos, deputados e senadores
Comentários nas notícias
adicionando mais politicos e refatorando
Flag offensive comments link
Merge branch 'implement_multiple_feeds'

Conflicts:
	meupolitico.db
	politicians/models.py
	politicians/templates/politicians/news.html
Synched database

South is a piece of crap, it couldn't migrate the database, all data must
be added again, because I deleted everything. Good luck Victor.
Merge branch 'implement_bias_news'

Conflicts:
	fts/tests.py
	meupolitico.db
	politicians/models.py
	politicians/templates/politicians/news.html
	politicians/tests.py
	politicians/views.py
Merge branch 'comments'

Conflicts:
	meupolitico.db
	politicians/templates/politicians/news.html
Merge branch 'postgredb'

I couldn't get postgre to run, so I made minimal changes to revert to
sqlite. Someone (Victor) should make it work.

Conflicts:
	meupolitico/settings.py
	politicians/admin.py
	politicians/models.py
	politicians/static/politicians/css/custom.css
	politicians/templates/politicians/politician_profile.html
	politicians/tests.py