added devise
adjusted redirect upon signin
Merge branch 'devise'