Merging add-devise branch