Fix for facebook api
Output blocked
Avoid infinite loop on username suggestion
Merge branch 'AI3074-community_dashboard' into rails3_community_dashboard
Escape special char dash (-) on identifier format
Merge branch 'master' of gitlab.com:noosfero/noosfero
fixes
remove undefined methods
Merge branch 'rails3'
Merge branch 'script-sample-data' of https://gitlab.com/juniorsilva1001/noosfero

Conflicts:
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
sample-data: replace rand with sample
Fix duplicate author folder creation and duplicate save of work assignments
change type parameter for content_type
adding category endpoint
image-diff-overflow: fixed image's overflow on versioned article view
AI3107
update theme
cms-test: test that align is allowed as image attribute on textile
profile-editor-test: fix update_attributes stubs and pass only necessary to profile_data
edit-profile: adapt cucumber test to new format of birth-date
forum: fix cucumber test to not require specific url