added contact page
Merge branches 'HEAD' and 'master' into develop