edit friends button
コンフリクト修正
add website link menu
Merge branch 'master' of https://github.com/takanashi66/posfis into takanashi66-master