Add devise login screen
Merge remote-tracking branch 'upstream/master' into devise