added support for attribute ordering in display content plugin
add read more section
added image field to article
updating display content plugin unit tests
Merge branches 'next_colivre' and 'ActionItem2892' into ActionItem2892
removing unnecessary migrations
display content plugin - fix duplicated lead section
Merge branch 'ActionItem2892' of github.com:SerproLivre/noosfero into ActionItem2892
Merge branch 'next_colivre' into ActionItem2892
Fix bug with the new image field at suggest article
Merge branch 'AI2892-display_content_order_attributes' into stable

Conflicts:
	app/views/shared/_lead_and_body.rhtml
	plugins/display_content/lib/display_content_block.rb