made changes to devise branch
modified files for merging