pien entity em mer
pie_entity plugged into content stream config
pie entity version of photo and logo
pie entity
pie entity translations
some improvements in form of pie_entity
Merge remote-tracking branch 'upstream/master' into pie_entity

Conflicts:
	src/cake/app/locale/por/LC_MESSAGES/content_stream.mo
	src/cake/app/locale/por/LC_MESSAGES/content_stream.po
Merge pull request #38 from rcaravita/pie_entity

Pie entity