- modified schema.rb after migrations
merged develop