Merge branch 'AI2905-performance' into stable

Conflicts:
	config/initializers/view_paths.rb
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable
Merge branch 'stable' of https://github.com/SerproLivre/noosfero into stable