Backend do registro de redes sociais tumblr e instagram
Adicionados ícones de redes sociais tumblr e instagram
Merge branch 'master' into issue_150

Conflicts:
	CHANGES.rst
Updated changelog
Merge pull request #151 from plonegovbr/issue_150

Issue 150 - Adicionados ícones de redes sociais tumblr e instagram closes #150
Merge branch 'master' into issue_152

Conflicts:
	CHANGES.rst