merges master and fixes conflicts

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150813161654) do
+ActiveRecord::Schema.define(version: 20150815154430) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -88,6 +88,7 @@ ActiveRecord::Schema.define(version: 20150813161654) do
   create_table "tags", force: :cascade do |t|
     t.string  "name"
     t.integer "taggings_count", default: 0
+    t.boolean "featured",       default: false
   end
 
   add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree