devise added
devise added
devise merge