rails g devise editor
merged master fixed conflict