devise branch for front-end and devise merging