Merge branch 'master' into tracking_user_verifications_and_others

Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb

config/locales/admin.en.yml

@@ -145,6 +145,9 @@ en:
       proposal_search:
         button: Search
         placeholder: Search proposals by title, code, description or question
+      spending_proposal_search:
+        button: Search
+        placeholder: Search spending proposals by title or description
       user_search:
         button: Search
         placeholder: Search user by name or email'
@@ -152,6 +155,7 @@ en:
       index:
         geozone_filter_all: All zones
         administrator_filter_all: All administrators
+        valuator_filter_all: All valuators
         tags_filter_all: All tags
         filters:
           valuation_open: Open
@@ -169,6 +173,7 @@ en:
         back: Back
         classification: Clasification
         heading: "Investment project %{id}"
+        edit: Edit
         edit_classification: Edit classification
         association_name: Association
         by: By
@@ -195,6 +200,7 @@ en:
           debates: Debates
           proposal_votes: Proposal votes
           proposals: Proposals
+          spending_proposals: Spending Proposals
           unverified_users: Unverified users
           user_level_three: Level three users
           user_level_two: Level two users
@@ -203,6 +209,7 @@ en:
           verified_users_who_didnt_vote_proposals: Verified users who didn't votes proposals
           visits: Visits
           votes: Total votes
+        spending_proposals_title: Spending Proposals
         visits_title: Visits
     tags:
       create: Create Topic