added customize devise functionality
committing after resolving conflicts