Merge devise to master