Before adding devise
Merge remote-tracking branch 'origin/t' into t