add devise
add links
Merge branch 'master' into user
update master