Merge branch 'AI2499-block_parentorganizations' of https://github.com/fga-unb/noosfero into comigrar
Merge branch 'AI2587-agenda_improvements' of https://github.com/fga-unb/noosfero into comigrar
Merge branch 'AI2810-box_organizer' of https://github.com/fga-unb/noosfero into comigrar
Merge branch 'rebase-AI2844-join_button' of https://github.com/fga-unb/noosfero into comigrar
Merge branch 'AI2847-template_leftfooter' of https://github.com/fga-unb/noosfero into comigrar
Merge branch 'AI2848-block_recent_articles' of https://github.com/fga-unb/noosfero into comigrar
Resolving conflict in Style.css
Merge branch 'AI2881-permission_level' of https://github.com/fga-unb/noosfero into comigrar