shared as per develop
shared as per master
front page changes
before pull
Merge branch 'master' of https://github.com/xavocinternational/xavoc.com
Merge branch 'master' into develop