schema is changed
Merge branch 'master' of https://github.com/FrenchBully/chatchat
fixed conflicts
styled devise edit page