fixes conflicts with master

app/models/concerns/taggable.rb

@@ -3,6 +3,7 @@ module Taggable
 
   included do
     acts_as_taggable
+    validate :max_number_of_tags
   end
 
   def tag_list_with_limit(limit = nil)
@@ -17,4 +18,8 @@ module Taggable
     count = tags.size - limit
     count < 0 ? 0 : count
   end
+
+  def max_number_of_tags
+    errors.add(:tag_list, :less_than_or_equal_to, count: 6) if tag_list.count > 6
+  end
 end

app/models/proposal.rb

@@ -65,7 +65,7 @@ class Proposal < ActiveRecord::Base
   end
 
   def code
-    "#{Setting.value_for("proposal_code_prefix")}-#{created_at.strftime('%Y-%M')}-#{id}"
+    "#{Setting.value_for("proposal_code_prefix")}-#{created_at.strftime('%Y-%m')}-#{id}"
   end
 
   def after_commented