diff --git a/Gemfile b/Gemfile
index 50748b2..dbf3824 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,6 @@ gem 'nokogiri'
 gem 'rake', :require => false
 gem 'rest-client'
 gem 'exception_notification'
-gem 'gettext_rails'
 
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
diff --git a/Gemfile.lock b/Gemfile.lock
index 79bbfb5..a585c84 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,15 +67,6 @@ GEM
       activesupport (>= 3.0.4)
     fast_gettext (0.6.8)
     ffi (1.0.11)
-    gettext (2.2.1)
-      locale
-    gettext_activerecord (2.1.0)
-      activerecord (>= 2.3.2)
-      gettext (>= 2.1.0)
-    gettext_rails (2.1.0)
-      gettext_activerecord (>= 2.1.0)
-      locale_rails (>= 2.0.5)
-      rails (>= 2.3.2)
     gherkin (2.4.21)
       json (>= 1.4.6)
     hike (1.2.1)
@@ -83,9 +74,6 @@ GEM
     i18n (0.6.0)
     journey (1.0.3)
     json (1.7.3)
-    locale (2.0.5)
-    locale_rails (2.0.5)
-      locale (>= 2.0.5)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -184,7 +172,6 @@ DEPENDENCIES
   database_cleaner
   exception_notification
   fast_gettext
-  gettext_rails
   hpricot
   mocha
   nokogiri
diff --git a/app/controllers/admin/environment_design_controller.rb b/app/controllers/admin/environment_design_controller.rb
index 3320c8f..442f39d 100644
--- a/app/controllers/admin/environment_design_controller.rb
+++ b/app/controllers/admin/environment_design_controller.rb
@@ -3,9 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController
   protect 'edit_environment_design', :environment
 
   def available_blocks
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    @blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @blocks ||= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
 
diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index 3025533..9748164 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -4,6 +4,12 @@ class CmsController < MyProfileController
 
   include ArticleHelper
 
+  def search_tags
+    arg = params[:term].downcase
+    result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
+  end
+
   def self.protect_if(*args)
     before_filter(*args) do |c|
       user, profile = c.send(:user), c.send(:profile)
diff --git a/app/helpers/article_helper.rb b/app/helpers/article_helper.rb
index 26bc18d..567de43 100644
--- a/app/helpers/article_helper.rb
+++ b/app/helpers/article_helper.rb
@@ -83,6 +83,10 @@ module ArticleHelper
     array.map { |object| {:id => object.id, :name => object.name} }
   end
 
+  def prepare_to_token_input_by_label(array)
+    array.map { |object| {:label => object.name, :value => object.name} }
+  end
+
   def cms_label_for_new_children
     _('New article')
   end
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
index fcedc07..e29bb4f 100644
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -28,6 +28,7 @@ module LayoutHelper
       'lightbox',
       'colorbox',
       'block_store',
+      'inputosaurus',
       pngfix_stylesheet_path,
     ] + tokeninput_stylesheets
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
diff --git a/app/models/box.rb b/app/models/box.rb
index df97a41..9aa00e8 100644
--- a/app/models/box.rb
+++ b/app/models/box.rb
@@ -28,9 +28,6 @@ class Box < ActiveRecord::Base
       CategoriesBlock,
       CommunitiesBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeedReaderBlock,
@@ -53,9 +50,6 @@ class Box < ActiveRecord::Base
       CommunitiesBlock,
       DisabledEnterpriseMessageBlock,
       EnterprisesBlock,
-      # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-      #      the Noosfero core soon, see ActionItem3045
-      EnvironmentStatisticsBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
       FeaturedProductsBlock,
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 952a165..861a932 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -177,9 +177,6 @@ class Environment < ActiveRecord::Base
 
     # "left" area
     env.boxes[1].blocks << LoginBlock.new
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    env.boxes[1].blocks << EnvironmentStatisticsBlock.new
     env.boxes[1].blocks << RecentDocumentsBlock.new
 
     # "right" area
diff --git a/app/models/environment_statistics_block.rb b/app/models/environment_statistics_block.rb
deleted file mode 100644
index 359891c..0000000
--- a/app/models/environment_statistics_block.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-#      the Noosfero core soon, see ActionItem3045
-
-class EnvironmentStatisticsBlock < Block
-
-  def self.description
-    _('Environment stastistics (DEPRECATED)')
-  end
-
-  def default_title
-    _('Statistics for %s') % owner.name
-  end
-
-  def help
-    _('This block presents some statistics about your environment.')
-  end
-
-  def content(args={})
-    users = owner.people.visible.count
-    enterprises = owner.enterprises.visible.count
-    communities = owner.communities.visible.count
-
-    info = []
-    info << (n_('One user', '%{num} users', users) % { :num => users })
-    unless owner.enabled?('disable_asset_enterprises')
-      info << (n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
-    end
-    info << (n_('One community', '%{num} communities', communities) % { :num => communities })
-
-    block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
-  end
-
-end
diff --git a/app/sweepers/profile_sweeper.rb b/app/sweepers/profile_sweeper.rb
index e23f9b4..454b593 100644
--- a/app/sweepers/profile_sweeper.rb
+++ b/app/sweepers/profile_sweeper.rb
@@ -8,9 +8,6 @@ class ProfileSweeper # < ActiveRecord::Observer
   end
 
   def after_create(profile)
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    expire_statistics_block_cache(profile)
   end
 
 protected
@@ -31,13 +28,6 @@ protected
     expire_blogs(profile) if profile.organization?
   end
 
-  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-  #      the Noosfero core soon, see ActionItem3045
-  def expire_statistics_block_cache(profile)
-    blocks = profile.environment.blocks.select { |b| b.kind_of?(EnvironmentStatisticsBlock) }
-    BlockSweeper.expire_blocks(blocks)
-  end
-
   def expire_blogs(profile)
     profile.blogs.select{|b| !b.empty?}.each do |blog|
       pages = blog.posts.count / blog.posts_per_page + 1
diff --git a/app/views/cms/edit.html.erb b/app/views/cms/edit.html.erb
index c38af1c..2508a60 100644
--- a/app/views/cms/edit.html.erb
+++ b/app/views/cms/edit.html.erb
@@ -31,9 +31,18 @@
 
   <%= select_categories(:article, _('Categorize your article')) %>
 
+  <br />
+
   <%= f.text_field('tag_list', :size => 64) %>
   <%= content_tag( 'small', _('Separate tags with commas') ) %>
 
+  <script>
+    jQuery('#article_tag_list').inputosaurus({
+      autoCompleteSource: <%= "'/myprofile/#{profile.identifier}/cms/search_tags'," %>
+      activateFinalResult : true
+    })
+  </script>
+
   <div id='edit-article-options'>
     <%= options_for_article(@article, @tokenized_children) %>
   </div>
diff --git a/app/views/layouts/_javascript.html.erb b/app/views/layouts/_javascript.html.erb
index 33c05d4..f33bdc4 100644
--- a/app/views/layouts/_javascript.html.erb
+++ b/app/views/layouts/_javascript.html.erb
@@ -4,7 +4,7 @@
 'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
 'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
-'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'application.js', 'rails.js', :cache => 'cache/application' %>
+'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'application.js', 'rails.js', 'inputosaurus.js', :cache => 'cache/application' %>
 
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
diff --git a/baseplugins/statistics b/baseplugins/statistics
new file mode 120000
index 0000000..6620f62
--- /dev/null
+++ b/baseplugins/statistics
@@ -0,0 +1 @@
+../plugins/statistics
\ No newline at end of file
diff --git a/db/migrate/20140827191326_remove_environment_statistics_block.rb b/db/migrate/20140827191326_remove_environment_statistics_block.rb
new file mode 100644
index 0000000..0a65ca9
--- /dev/null
+++ b/db/migrate/20140827191326_remove_environment_statistics_block.rb
@@ -0,0 +1,9 @@
+class RemoveEnvironmentStatisticsBlock < ActiveRecord::Migration
+  def self.up
+    update("UPDATE blocks SET type = 'StatisticsBlock' WHERE type = 'EnvironmentStatisticsBlock'")
+  end
+
+  def self.down
+    say("Nothing to undo (cannot recover the data)")
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a80f7c2..bde81b5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140808185510) do
+ActiveRecord::Schema.define(:version => 20140827191326) do
 
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -241,6 +241,7 @@ ActiveRecord::Schema.define(:version => 20140808185510) do
     t.string   "source_type"
     t.string   "user_agent"
     t.string   "referrer"
+    t.text     "setting"
   end
 
   add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
@@ -294,8 +295,8 @@ ActiveRecord::Schema.define(:version => 20140808185510) do
     t.text     "signup_welcome_text"
     t.string   "languages"
     t.string   "default_language"
-    t.string   "noreply_email"
     t.string   "redirection_after_signup",     :default => "keep_on_same_page"
+    t.string   "noreply_email"
   end
 
   create_table "external_feeds", :force => true do |t|
@@ -450,6 +451,21 @@ ActiveRecord::Schema.define(:version => 20140808185510) do
   add_index "products", ["product_category_id"], :name => "index_products_on_product_category_id"
   add_index "products", ["profile_id"], :name => "index_products_on_profile_id"
 
+  create_table "profile_suggestions", :force => true do |t|
+    t.integer  "person_id"
+    t.integer  "suggestion_id"
+    t.string   "suggestion_type"
+    t.text     "categories"
+    t.boolean  "enabled",         :default => true
+    t.float    "score",           :default => 0.0
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
+  end
+
+  add_index "profile_suggestions", ["person_id"], :name => "index_profile_suggestions_on_person_id"
+  add_index "profile_suggestions", ["score"], :name => "index_profile_suggestions_on_score"
+  add_index "profile_suggestions", ["suggestion_id"], :name => "index_profile_suggestions_on_suggestion_id"
+
   create_table "profiles", :force => true do |t|
     t.string   "name"
     t.string   "type"
@@ -483,11 +499,12 @@ ActiveRecord::Schema.define(:version => 20140808185510) do
     t.boolean  "is_template",                           :default => false
     t.integer  "template_id"
     t.string   "redirection_after_login"
+    t.string   "personal_website"
+    t.string   "jabber_id"
     t.integer  "friends_count",                         :default => 0,     :null => false
     t.integer  "members_count",                         :default => 0,     :null => false
     t.integer  "activities_count",                      :default => 0,     :null => false
-    t.string   "personal_website"
-    t.string   "jabber_id"
+    t.integer  "welcome_page_id"
   end
 
   add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"
@@ -556,6 +573,31 @@ ActiveRecord::Schema.define(:version => 20140808185510) do
     t.integer  "context_id"
   end
 
+  create_table "search_term_occurrences", :force => true do |t|
+    t.integer  "search_term_id"
+    t.datetime "created_at"
+    t.integer  "total",          :default => 0
+    t.integer  "indexed",        :default => 0
+  end
+
+  add_index "search_term_occurrences", ["created_at"], :name => "index_search_term_occurrences_on_created_at"
+
+  create_table "search_terms", :force => true do |t|
+    t.string  "term"
+    t.integer "context_id"
+    t.string  "context_type"
+    t.string  "asset",            :default => "all"
+    t.float   "score",            :default => 0.0
+    t.float   "relevance_score",  :default => 0.0
+    t.float   "occurrence_score", :default => 0.0
+  end
+
+  add_index "search_terms", ["asset"], :name => "index_search_terms_on_asset"
+  add_index "search_terms", ["occurrence_score"], :name => "index_search_terms_on_occurrence_score"
+  add_index "search_terms", ["relevance_score"], :name => "index_search_terms_on_relevance_score"
+  add_index "search_terms", ["score"], :name => "index_search_terms_on_score"
+  add_index "search_terms", ["term"], :name => "index_search_terms_on_term"
+
   create_table "sessions", :force => true do |t|
     t.string   "session_id", :null => false
     t.text     "data"
@@ -635,23 +677,25 @@ ActiveRecord::Schema.define(:version => 20140808185510) do
   create_table "users", :force => true do |t|
     t.string   "login"
     t.string   "email"
-    t.string   "crypted_password",          :limit => 40
-    t.string   "salt",                      :limit => 40
+    t.string   "crypted_password",           :limit => 40
+    t.string   "salt",                       :limit => 40
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "remember_token"
     t.datetime "remember_token_expires_at"
     t.text     "terms_of_use"
-    t.string   "terms_accepted",            :limit => 1
+    t.string   "terms_accepted",             :limit => 1
     t.integer  "environment_id"
     t.string   "password_type"
-    t.boolean  "enable_email",                            :default => false
-    t.string   "last_chat_status",                        :default => ""
-    t.string   "chat_status",                             :default => ""
+    t.boolean  "enable_email",                             :default => false
+    t.string   "last_chat_status",                         :default => ""
+    t.string   "chat_status",                              :default => ""
     t.datetime "chat_status_at"
-    t.string   "activation_code",           :limit => 40
+    t.string   "activation_code",            :limit => 40
     t.datetime "activated_at"
     t.string   "return_to"
+    t.string   "private_token"
+    t.datetime "private_token_generated_at"
   end
 
   create_table "validation_infos", :force => true do |t|
diff --git a/debian/control b/debian/control
index c8f7e10..cd3c6e7 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends:
  debhelper (>= 7.0.50~),
  po4a,
  ruby-gettext,
- ruby-gettext-rails,
  ruby-sqlite3,
  rake,
  rails3 (>= 3.2.6-1~),
diff --git a/public/javascripts/inputosaurus.js b/public/javascripts/inputosaurus.js
new file mode 100644
index 0000000..999d1a0
--- /dev/null
+++ b/public/javascripts/inputosaurus.js
@@ -0,0 +1,523 @@
+/**
+ * Inputosaurus Text 
+ *
+ * Must be instantiated on an <input> element
+ * Allows multiple input items. Each item is represented with a removable tag that appears to be inside the input area.
+ *
+ * @requires:
+ *
+ * 	jQuery 1.7+
+ * 	jQueryUI 1.8+ Core
+ *
+ * @version 0.1.6
+ * @author Dan Kielp <dan@sproutsocial.com>
+ * @created October 3,2012
+ *
+ */
+
+
+(function($) {
+
+	var inputosaurustext = {
+
+		version: "0.1.6",
+
+		eventprefix: "inputosaurus",
+
+		options: {
+
+			// bindable events
+			//
+			// 'change' - triggered whenever a tag is added or removed (should be similar to binding the the change event of the instantiated input
+			// 'keyup' - keyup event on the newly created input
+			
+			// while typing, the user can separate values using these delimiters
+			// the value tags are created on the fly when an inputDelimiter is detected
+			inputDelimiters : [',', ';'],
+
+			// this separator is used to rejoin all input items back to the value of the original <input>
+			outputDelimiter : ',',
+
+			allowDuplicates : false,
+
+			parseOnBlur : false,
+
+			// optional wrapper for widget
+			wrapperElement : null,
+
+			width : null,
+
+			// simply passing an autoComplete source (array, string or function) will instantiate autocomplete functionality
+			autoCompleteSource : '',
+
+			// When forcing users to select from the autocomplete list, allow them to press 'Enter' to select an item if it's the only option left.
+			activateFinalResult : false,
+
+			// manipulate and return the input value after parseInput() parsing
+			// the array of tag names is passed and expected to be returned as an array after manipulation
+			parseHook : null,
+			
+			// define a placeholder to display when the input is empty
+			placeholder: null,
+			
+			// when you check for duplicates it check for the case
+			caseSensitiveDuplicates: false
+		},
+
+		_create: function() {
+			var widget = this,
+				els = {},
+				o = widget.options,
+				placeholder =  o.placeholder || this.element.attr('placeholder') || null;
+				
+			this._chosenValues = [];
+
+			// Create the elements
+			els.ul = $('<ul class="inputosaurus-container">');
+			els.input = $('<input type="text" />');
+			els.inputCont = $('<li class="inputosaurus-input inputosaurus-required"></li>');
+			els.origInputCont = $('<li class="inputosaurus-input-hidden inputosaurus-required">');
+			
+			// define starting placeholder
+			if (placeholder) { 
+				o.placeholder = placeholder;
+				els.input.attr('placeholder', o.placeholder); 
+				if (o.width) {
+					els.input.css('min-width', o.width - 50);
+				}
+			}
+
+			o.wrapperElement && o.wrapperElement.append(els.ul);
+			this.element.replaceWith(o.wrapperElement || els.ul);
+			els.origInputCont.append(this.element).hide();
+			
+			els.inputCont.append(els.input);
+			els.ul.append(els.inputCont);
+			els.ul.append(els.origInputCont);
+			
+			o.width && els.ul.css('width', o.width);
+
+			this.elements = els;
+
+			widget._attachEvents();
+
+			// if instantiated input already contains a value, parse that junk
+			if($.trim(this.element.val())){
+				els.input.val( this.element.val() );
+				this.parseInput();
+			}
+
+			this._instAutocomplete();
+		},
+
+		_instAutocomplete : function() {
+			if(this.options.autoCompleteSource){
+				var widget = this;
+
+				this.elements.input.autocomplete({
+					position : {
+						of : this.elements.ul
+					},
+					source : this.options.autoCompleteSource,
+					minLength : 1,
+					select : function(ev, ui){
+						ev.preventDefault();
+						widget.elements.input.val(ui.item.value);
+						widget.parseInput();
+					},
+					open : function() {
+						// Older versions of jQueryUI have a different namespace
+						var auto =  $(this).data('ui-autocomplete') || $(this).data('autocomplete');
+						var menu = auto.menu,
+							$menuItems;
+						
+						
+						// zIndex will force the element on top of anything (like a dialog it's in)
+						menu.element.zIndex && menu.element.zIndex($(this).zIndex() + 1);
+						menu.element.width(widget.elements.ul.outerWidth());
+
+						// auto-activate the result if it's the only one
+						if(widget.options.activateFinalResult){
+							$menuItems = menu.element.find('li');
+
+							// activate single item to allow selection upon pressing 'Enter'
+							if($menuItems.size() === 1){
+								menu[menu.activate ? 'activate' : 'focus']($.Event('click'), $menuItems);
+							}
+						}
+					}
+				});
+			}
+		},
+
+		_autoCompleteMenuPosition : function() {
+			var widget;
+			if(this.options.autoCompleteSource){
+				widget = this.elements.input.data('ui-autocomplete') || this.elements.input.data('autocomplete');
+				widget && widget.menu.element.position({
+					of: this.elements.ul,
+					my: 'left top',
+					at: 'left bottom',
+					collision: 'none'
+				});
+			}
+		},
+
+		/*_closeAutoCompleteMenu : function() {
+			if(this.options.autoCompleteSource){
+				this.elements.input.autocomplete('close');
+			}
+		},*/
+
+		parseInput : function(ev) {
+			var widget = (ev && ev.data.widget) || this,
+				val,
+				delimiterFound = false,
+				values = [];
+
+			val = widget.elements.input.val();
+
+			val && (delimiterFound = widget._containsDelimiter(val));
+
+			if(delimiterFound !== false){
+				values = val.split(delimiterFound);
+			} else if(!ev || ev.which === $.ui.keyCode.ENTER && !$('.ui-menu-item.ui-state-focus').size() && !$('.ui-menu-item .ui-state-focus').size() && !$('#ui-active-menuitem').size()){
+				values.push(val);
+				ev && ev.preventDefault();
+
+			// prevent autoComplete menu click from causing a false 'blur'
+			} else if(ev.type === 'blur' && !$('#ui-active-menuitem').size()){
+				values.push(val);
+			}
+
+			$.isFunction(widget.options.parseHook) && (values = widget.options.parseHook(values));
+
+			if(values.length){
+				widget._setChosen(values);
+				widget.elements.input.val('');
+				widget._resizeInput();
+			}
+
+			widget._resetPlaceholder();
+		},
+
+		_inputFocus : function(ev) {
+			var widget = ev.data.widget || this;
+
+			widget.elements.input.value || (widget.options.autoCompleteSource.length && widget.elements.input.autocomplete('search', ''));
+		},
+
+		_inputKeypress : function(ev) {
+			var widget = ev.data.widget || this;
+
+			ev.type === 'keyup' && widget._trigger('keyup', ev, widget);
+
+			switch(ev.which){
+				case $.ui.keyCode.BACKSPACE:
+					ev.type === 'keydown' && widget._inputBackspace(ev);
+					break;
+
+				case $.ui.keyCode.LEFT:
+					ev.type === 'keydown' && widget._inputBackspace(ev);
+					break;
+
+				default :
+					widget.parseInput(ev);
+					widget._resizeInput(ev);
+			}
+
+			// reposition autoComplete menu as <ul> grows and shrinks vertically
+			if(widget.options.autoCompleteSource){
+				setTimeout(function(){widget._autoCompleteMenuPosition.call(widget);}, 200);
+			}
+		},
+
+		// the input dynamically resizes based on the length of its value
+		_resizeInput : function(ev) {
+			var widget = (ev && ev.data.widget) || this,
+				maxWidth = widget.elements.ul.width(),
+				val = widget.elements.input.val(),
+				txtWidth = 25 + val.length * 8;
+
+			widget.elements.input.width(txtWidth < maxWidth ? txtWidth : maxWidth);
+		},
+		
+		// resets placeholder on representative input
+		_resetPlaceholder: function () {
+			var placeholder = this.options.placeholder,
+				input = this.elements.input,
+				width = this.options.width || 'inherit';
+			if (placeholder && this.element.val().length === 0) {
+				input.attr('placeholder', placeholder).css('min-width', width - 50)
+			}else {
+				input.attr('placeholder', '').css('min-width', 'inherit')
+			}
+		},
+
+		// if our input contains no value and backspace has been pressed, select the last tag
+		_inputBackspace : function(ev) {
+			var widget = (ev && ev.data.widget) || this;
+				lastTag = widget.elements.ul.find('li:not(.inputosaurus-required):last');
+
+			// IE goes back in history if the event isn't stopped
+			ev.stopPropagation();
+
+			if((!$(ev.currentTarget).val() || (('selectionStart' in ev.currentTarget) && ev.currentTarget.selectionStart === 0 && ev.currentTarget.selectionEnd === 0)) && lastTag.size()){
+				ev.preventDefault();
+				lastTag.find('a').focus();
+			}
+			
+		},
+
+		_editTag : function(ev) {
+			var widget = (ev && ev.data.widget) || this,
+				tagName = '',
+				$closest = $(ev.currentTarget).closest('li'),
+				tagKey = $closest.data('ui-inputosaurus') ||  $closest.data('inputosaurus');
+
+			if(!tagKey){
+				return true;
+			}
+
+			ev.preventDefault();
+
+			$.each(widget._chosenValues, function(i,v) {
+				v.key === tagKey && (tagName = v.value);
+			});
+
+			widget.elements.input.val(tagName);
+
+			widget._removeTag(ev);
+			widget._resizeInput(ev);
+		},
+
+		_tagKeypress : function(ev) {
+			var widget = ev.data.widget;
+			switch(ev.which){
+
+				case $.ui.keyCode.BACKSPACE: 
+					ev && ev.preventDefault();
+					ev && ev.stopPropagation();
+					$(ev.currentTarget).trigger('click');
+					break;
+
+				// 'e' - edit tag (removes tag and places value into visible input
+				case 69:
+					widget._editTag(ev);
+					break;
+
+				case $.ui.keyCode.LEFT:
+					ev.type === 'keydown' && widget._prevTag(ev);
+					break;
+
+				case $.ui.keyCode.RIGHT:
+					ev.type === 'keydown' && widget._nextTag(ev);
+					break;
+
+				case $.ui.keyCode.DOWN:
+					ev.type === 'keydown' && widget._focus(ev);
+					break;
+			}
+		},
+
+		// select the previous tag or input if no more tags exist
+		_prevTag : function(ev) {
+			var widget = (ev && ev.data.widget) || this,
+				tag = $(ev.currentTarget).closest('li'),
+				previous = tag.prev();
+
+			if(previous.is('li')){
+				previous.find('a').focus();
+			} else {
+				widget._focus();
+			}
+		},
+
+		// select the next tag or input if no more tags exist
+		_nextTag : function(ev) {
+			var widget = (ev && ev.data.widget) || this,
+				tag = $(ev.currentTarget).closest('li'),
+				next = tag.next();
+
+			if(next.is('li:not(.inputosaurus-input)')){
+				next.find('a').focus();
+			} else {
+				widget._focus();
+			}
+		},
+
+		// return the inputDelimiter that was detected or false if none were found
+		_containsDelimiter : function(tagStr) {
+
+			var found = false;
+
+			$.each(this.options.inputDelimiters, function(k,v) {
+				if(tagStr.indexOf(v) !== -1){
+					found = v;
+				}
+			});
+
+			return found;
+		},
+
+		_setChosen : function(valArr) {
+			var self = this;
+
+			if(!$.isArray(valArr)){
+				return false;
+			}
+
+			$.each(valArr, function(k,v) {
+				var exists = false,
+					obj = {
+						key : '',
+						value : ''
+					};
+
+				v = $.trim(v);
+
+				$.each(self._chosenValues, function(kk,vv) {
+					if(!self.options.caseSensitiveDuplicates){
+						vv.value.toLowerCase() === v.toLowerCase() && (exists = true);
+					}
+					else{
+						vv.value === v && (exists = true);
+					}
+				});
+
+				if(v !== '' && (!exists || self.options.allowDuplicates)){
+
+					obj.key = 'mi_' + Math.random().toString( 16 ).slice( 2, 10 );
+					obj.value = v;
+					self._chosenValues.push(obj);
+
+					self._renderTags();
+				}
+			});
+			self._setValue(self._buildValue());
+		},
+
+		_buildValue : function() {
+			var widget = this,
+				value = '';
+
+			$.each(this._chosenValues, function(k,v) {
+				value +=  value.length ? widget.options.outputDelimiter + v.value : v.value;
+			});
+
+			return value;
+		},
+
+		_setValue : function(value) {
+			var val = this.element.val();
+
+			if(val !== value){
+				this.element.val(value);
+				this._trigger('change');
+			}
+		},
+
+		// @name text for tag
+		// @className optional className for <li>
+		_createTag : function(name, key, className) {
+			className = className ? ' class="' + className + '"' : '';
+
+			if(name !== undefined){
+				return $('<li' + className + ' data-inputosaurus="' + key + '"><span>' + name + '</span> <a href="javascript:void(0);" class="ficon">&#x2716;</a></li>');
+			}
+		},
+
+		_renderTags : function() {
+			var self = this;
+
+			this.elements.ul.find('li:not(.inputosaurus-required)').remove();
+
+			$.each(this._chosenValues, function(k,v) {
+				var el = self._createTag(v.value, v.key);
+				self.elements.ul.find('li.inputosaurus-input').before(el);
+			});
+		},
+
+		_removeTag : function(ev) {
+			var $closest = $(ev.currentTarget).closest('li'), 
+				key = $closest.data('ui-inputosaurus') || $closest.data('inputosaurus'),
+				indexFound = false,
+				widget = (ev && ev.data.widget) || this;
+
+
+			$.each(widget._chosenValues, function(k,v) {
+				if(key === v.key){
+					indexFound = k;
+				}
+			});
+
+			indexFound !== false && widget._chosenValues.splice(indexFound, 1);
+
+			widget._setValue(widget._buildValue());
+
+			$(ev.currentTarget).closest('li').remove();
+			widget.elements.input.focus();
+		},
+
+		_focus : function(ev) {
+			var widget = (ev && ev.data.widget) || this,
+				$closest = $(ev.target).closest('li'),
+				$data = $closest.data('ui-inputosaurus') || $closest.data('inputosaurus');
+
+			if(!ev || !$data){
+				widget.elements.input.focus();
+			}
+		},
+
+		_tagFocus : function(ev) {
+			$(ev.currentTarget).parent()[ev.type === 'focusout' ? 'removeClass' : 'addClass']('inputosaurus-selected');
+		},
+
+		refresh : function() {
+			var delim = this.options.outputDelimiter,
+				val = this.element.val(),
+				values = [];
+			
+			values.push(val);
+			delim && (values = val.split(delim));
+
+			if(values.length){
+				this._chosenValues = [];
+
+				$.isFunction(this.options.parseHook) && (values = this.options.parseHook(values));
+
+				this._setChosen(values);
+				this._renderTags();
+				this.elements.input.val('');
+				this._resizeInput();
+			}
+		},
+
+		_attachEvents : function() {
+			var widget = this;
+
+			this.elements.input.on('keyup.inputosaurus', {widget : widget}, this._inputKeypress);
+			this.elements.input.on('keydown.inputosaurus', {widget : widget}, this._inputKeypress);
+			this.elements.input.on('change.inputosaurus', {widget : widget}, this._inputKeypress);
+			this.elements.input.on('focus.inputosaurus', {widget : widget}, this._inputFocus);
+			this.options.parseOnBlur && this.elements.input.on('blur.inputosaurus', {widget : widget}, this.parseInput);
+
+			this.elements.ul.on('click.inputosaurus', {widget : widget}, this._focus);
+			this.elements.ul.on('click.inputosaurus', 'a', {widget : widget}, this._removeTag);
+			this.elements.ul.on('dblclick.inputosaurus', 'li', {widget : widget}, this._editTag);
+			this.elements.ul.on('focus.inputosaurus', 'a', {widget : widget}, this._tagFocus);
+			this.elements.ul.on('blur.inputosaurus', 'a', {widget : widget}, this._tagFocus);
+			this.elements.ul.on('keydown.inputosaurus', 'a', {widget : widget}, this._tagKeypress);
+		},
+
+		_destroy: function() {
+			this.elements.input.unbind('.inputosaurus');
+
+			this.elements.ul.replaceWith(this.element);
+
+		}
+	};
+
+	$.widget("ui.inputosaurus", inputosaurustext);
+})(jQuery);
+
diff --git a/public/stylesheets/inputosaurus.css b/public/stylesheets/inputosaurus.css
new file mode 100644
index 0000000..82cb72e
--- /dev/null
+++ b/public/stylesheets/inputosaurus.css
@@ -0,0 +1,76 @@
+.inputosaurus-container .ui-autocomplete-input {
+  background-color: #ffffff;
+}
+
+.inputosaurus-container {
+	/*background-color: #fff;*/
+	/*border: 1px solid #bcbec0;*/
+	margin: 0;
+	padding: 0;
+	display: inline-block;
+	cursor: text;
+	/**font-size: 14px;**/
+	/**font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;**/
+	max-height: 300px;
+	overflow: hidden;
+	overflow-y: auto;
+}
+.inputosaurus-container li {
+	display: block;
+	float: left;
+	overflow: hidden;
+	margin: 2px 2px 0;
+	padding: 2px 3px;
+	white-space: nowrap;
+	overflow: hidden;
+	-o-text-overflow: ellipsis;
+	-ms-text-overflow: ellipsis;
+	text-overflow: ellipsis;
+	background-color: #e5eff7;
+	border: #a9cae4 solid 1px;
+	-webkit-border-radius: 2px;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	color: #5b9bcd;
+	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.75) inset;
+	-moz-box-shadow: 0 1px 0 rgba(255,255,255,0.75) inset;
+	box-shadow: 0 1px 0 rgba(255,255,255,0.75) inset;
+	line-height: 20px;
+	cursor: default;
+}
+.inputosaurus-container li.inputosaurus-selected { background-color: #bdd6eb; }
+.inputosaurus-container li a {
+	font-size: 16px;
+	color: #5b9bcd;
+	padding: 1px;
+	text-decoration: none;
+	outline: none;
+}
+.inputosaurus-container .inputosaurus-input {
+	border: none;
+	box-shadow: none;
+}
+.inputosaurus-container .inputosaurus-input input {
+	border: none;
+	height: 23px;
+	font-size: 14px;
+	line-height: 20px;
+	color: #555;
+	margin: 0;
+	outline: none;
+	padding: 0 0 1px 1px;
+	width: 25px;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+  background-image: none;
+  text-indent: 0px;
+}
+
+.inputosaurus-container .inputosaurus-input input:hover {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+  background-color: #f0f0f0;
+}
+.inputosaurus-input-hidden { display: none; }
diff --git a/script/noosfero-plugins b/script/noosfero-plugins
index 7a43a33..f245ef5 100755
--- a/script/noosfero-plugins
+++ b/script/noosfero-plugins
@@ -77,8 +77,7 @@ run(){
 
 _enable(){
   plugin="$1"
-  cd $enabled_plugins_dir
-  source="../../plugins/$plugin"
+  source="$available_plugins_dir/$plugin"
   target="$enabled_plugins_dir/$plugin"
   base="$base_plugins_dir/$plugin"
   run "$source/before_enable.rb"
@@ -101,15 +100,11 @@ _enable(){
       fi
     fi
     if [ "$installation_ok" = true ] && [ "$dependencies_ok" = true ]; then
-      ln -s "$source" "$plugin"
+      ln -s "$source" "$target"
       plugins_public_dir="$NOOSFERO_DIR/public/plugins"
       plugins_features_dir="$NOOSFERO_DIR/features/plugins"
-      cd $plugins_public_dir
-      test -d "$source/public" && ln -s "$source/public" "$plugin"
-      if [ -d "$NOOSFERO_DIR/features" ]; then
-        cd $plugins_features_dir
-        test -d "$source/features" && ln -s "$source/features" "$plugin"
-      fi
+      test -d "$target/public" && ln -s "$target/public" "$plugins_public_dir/$plugin"
+      test -d "$NOOSFERO_DIR/features" && test -d "$target/features" && ln -s "$target/features" "$plugins_features_dir/$plugin"
       _say "$plugin enabled"
       run "$source/after_enable.rb"
       needs_migrate=true
diff --git a/script/quick-start b/script/quick-start
index 80bf817..d7fc2dc 100755
--- a/script/quick-start
+++ b/script/quick-start
@@ -85,7 +85,7 @@ fi
 run rake db:schema:load
 run rake db:data:minimal
 run rake db:test:prepare
-run rails runner 'Environment.default.enable("skip_new_user_email_confirmation")'
+rails runner 'Environment.default.enable("skip_new_user_email_confirmation")'
 
 # FIXME compile translations depends on ruby-gettext-rails, please see debian/control
 # run rake noosfero:translations:compile
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index 2ebe5f8..fa7b79b 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -1807,6 +1807,23 @@ class CmsControllerTest < ActionController::TestCase
     assert_template 'cms/publish'
   end
 
+  should 'response of search_tags be json' do
+    get :search_tags, :profile => profile.identifier, :term => 'linux'
+    assert_equal 'application/json', @response.content_type
+  end
+
+  should 'return empty json if does not find tag' do
+    get :search_tags, :profile => profile.identifier, :term => 'linux'
+    assert_equal "[]", @response.body
+  end
+
+  should 'return tags found' do
+    tag = mock; tag.stubs(:name).returns('linux')
+    ActsAsTaggableOn::Tag.stubs(:find).returns([tag])
+    get :search_tags, :profile => profile.identifier, :term => 'linux'
+    assert_equal '[{"label":"linux","value":"linux"}]', @response.body
+  end
+
   protected
 
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
diff --git a/test/functional/environment_design_controller_test.rb b/test/functional/environment_design_controller_test.rb
index 5f9eac5..234a17b 100644
--- a/test/functional/environment_design_controller_test.rb
+++ b/test/functional/environment_design_controller_test.rb
@@ -6,9 +6,7 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end
 
 class EnvironmentDesignControllerTest < ActionController::TestCase
 
-  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-  #      the Noosfero core soon, see ActionItem3045
-  ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+  ALL_BLOCKS = [ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
 
   def setup
     @controller = EnvironmentDesignController.new
@@ -77,18 +75,6 @@ class EnvironmentDesignControllerTest < ActionController::TestCase
     assert_tag :tag => 'p', :attributes => { :id => 'no_portal_community' }
   end
 
-  # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-  #      the Noosfero core soon, see ActionItem3045
-  should 'be able to edit EnvironmentStatisticsBlock' do
-    login_as(create_admin_user(Environment.default))
-    b = EnvironmentStatisticsBlock.create!
-    e = Environment.default
-    e.boxes.create!
-    e.boxes.first.blocks << b
-    get :edit, :id => b.id
-    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
-  end
-
   should 'be able to edit EnterprisesBlock' do
     login_as(create_admin_user(Environment.default))
     b = EnterprisesBlock.create!
diff --git a/test/unit/box_test.rb b/test/unit/box_test.rb
index 4a3c06a..d9f7e07 100644
--- a/test/unit/box_test.rb
+++ b/test/unit/box_test.rb
@@ -33,9 +33,6 @@ class BoxTest < ActiveSupport::TestCase
     assert blocks.include?('categories-block')
     assert blocks.include?('communities-block')
     assert blocks.include?('enterprises-block')
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    assert blocks.include?('environment-statistics-block')
     assert blocks.include?('fans-block')
     assert blocks.include?('favorite-enterprises-block')
     assert blocks.include?('feed-reader-block')
@@ -64,9 +61,6 @@ class BoxTest < ActiveSupport::TestCase
     assert blocks.include?('communities-block')
     assert blocks.include?('disabled-enterprise-message-block')
     assert blocks.include?('enterprises-block')
-    # TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-    #      the Noosfero core soon, see ActionItem3045
-    assert blocks.include?('environment-statistics-block')
     assert blocks.include?('fans-block')
     assert blocks.include?('favorite-enterprises-block')
     assert blocks.include?('featured-products-block')
diff --git a/test/unit/environment_statistics_block_test.rb b/test/unit/environment_statistics_block_test.rb
deleted file mode 100644
index 53d740e..0000000
--- a/test/unit/environment_statistics_block_test.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# TODO EnvironmentStatisticsBlock is DEPRECATED and will be removed from
-#      the Noosfero core soon, see ActionItem3045
-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class EnvironmentStatisticsBlockTest < ActiveSupport::TestCase
-
-  should 'inherit from Block' do
-    assert_kind_of Block, EnvironmentStatisticsBlock.new
-  end
-
-  should 'describe itself' do
-    assert_not_equal Block.description, EnvironmentStatisticsBlock.description
-  end
-
-  should 'provide a default title' do
-    owner = mock
-    owner.expects(:name).returns('my environment')
-
-    block = EnvironmentStatisticsBlock.new
-    block.expects(:owner).returns(owner)
-    assert_equal 'Statistics for my environment', block.title
-  end
-
-  should 'generate statistics' do
-    env = create(Environment)
-    user1 = create_user('testuser1', :environment_id => env.id)
-    user2 = create_user('testuser2', :environment_id => env.id)
-
-    fast_create(Enterprise, :environment_id => env.id)
-    fast_create(Community, :environment_id => env.id)
-
-    block = EnvironmentStatisticsBlock.new
-    env.boxes.first.blocks << block
-
-    content = block.content
-
-    assert_match(/One enterprise/, content)
-    assert_match(/2 users/, content)
-    assert_match(/One community/, content)
-  end
-
-  should 'generate statistics including private profiles' do
-    env = create(Environment)
-    user1 = create_user('testuser1', :environment_id => env.id)
-    user2 = create_user('testuser2', :environment_id => env.id)
-    user3 = create_user('testuser3', :environment_id => env.id)
-    p = user3.person; p.public_profile = false; p.save!
-
-    fast_create(Enterprise, :environment_id => env.id)
-    fast_create(Enterprise, :environment_id => env.id, :public_profile => false)
-
-    fast_create(Community, :environment_id => env.id)
-    fast_create(Community, :environment_id => env.id, :public_profile => false)
-
-    block = EnvironmentStatisticsBlock.new
-    env.boxes.first.blocks << block
-
-    content = block.content
-
-    assert_match /2 enterprises/, content
-    assert_match /3 users/, content
-    assert_match /2 communities/, content
-  end
-
-  should 'generate statistics but not for not visible profiles' do
-    env = create(Environment)
-    user1 = create_user('testuser1', :environment_id => env.id)
-    user2 = create_user('testuser2', :environment_id => env.id)
-    user3 = create_user('testuser3', :environment_id => env.id)
-    p = user3.person; p.visible = false; p.save!
-
-    fast_create(Enterprise, :environment_id => env.id)
-    fast_create(Enterprise, :environment_id => env.id, :visible => false)
-
-    fast_create(Community, :environment_id => env.id)
-    fast_create(Community, :environment_id => env.id, :visible => false)
-
-    block = EnvironmentStatisticsBlock.new
-    env.boxes.first.blocks << block
-
-    content = block.content
-
-    assert_match /One enterprise/, content
-    assert_match /2 users/, content
-    assert_match /One community/, content
-  end
-
-  should 'not display enterprises if disabled' do
-    env = fast_create(Environment)
-    env.enable('disable_asset_enterprises', false)
-
-    block = EnvironmentStatisticsBlock.new
-    block.stubs(:owner).returns(env)
-
-    assert_no_match /enterprises/i, block.content
-  end
-
-end
--
libgit2 0.21.2