Bumping version 0.46.0~rc20140120171635
Updating AUTHORS file
box: pass holder class as type for extra blocks hotspot

(ActionItem2958)
article-lead: move js to separate file

article.js was being included twice.

(ActionItem2956)
cms-edit: move article.js include to the bottom of the file
Allow the admin users to change the environment theme on the admin panel.
Fixing AI2897 problems:

-Changed update_attribute to setting the attribute then 'save!'
-Removed some whitespaces
-The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb.

(ActionItem2897)

Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Added hotspots for comments
Bumping version 0.46.0
Merge branch 'noosfero_0.46.0'
Merge branch 'AI2897-environment_theme' of https://gitlab.com/unb-gama/noosfero into unb-gama/noosfero-AI2897-environment_theme
Merge branch 'unb-gama/noosfero-AI2897-environment_theme'
 Merge branch 'AI2897-environment_theme' into 'master'

Ai2897 Environment Theme

http://noosfero.org/Development/ActionItem2897

The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb.
Merge branch 'master' of gitlab.com:noosfero/noosfero
Added comment_classification plugin

Status and Labels for comments

http://noosfero.org/Development/CommentClassificationPlugin
display_content: allow contents defined on plugins to be selectable

(ActionItem2993)
Merge branch 'master_colivre' into stable

Conflicts:
	app/controllers/themes_controller.rb
	app/models/environment.rb
	test/functional/environment_themes_controller_test.rb
	test/unit/box_test.rb
Merge branch 'AI2993-display_content_plugin_content' into stable
fix piwik on application layout
Merge branch 'comment_classification' into stable