create new contact page
pull master branch
just fix conflict from linux