Added devise
Modified users