merges master and fixes conflicts

db/migrate/20150808141306_create_simple_captcha_data.rb

@@ -0,0 +1,15 @@
+class CreateSimpleCaptchaData < ActiveRecord::Migration
+  def self.up
+    create_table :simple_captcha_data do |t|
+      t.string :key, :limit => 40
+      t.string :value, :limit => 6
+      t.timestamps
+    end
+    
+    add_index :simple_captcha_data, :key, :name => "idx_key"
+  end
+
+  def self.down
+    drop_table :simple_captcha_data
+  end
+end

db/migrate/20150811161459_add_children_count_to_comments.rb

@@ -0,0 +1,9 @@
+class AddChildrenCountToComments < ActiveRecord::Migration
+  def up
+    add_column :comments, :children_count, :integer, default: 0
+  end
+
+  def down
+    remove_column :comments, :children_count
+  end
+end

db/migrate/20150815154430_add_featured_to_tags.rb

@@ -0,0 +1,5 @@
+class AddFeaturedToTags < ActiveRecord::Migration
+  def change
+    add_column :tags, :featured, :boolean, default: false
+  end
+end