finished site wise switching feature
Merge branch 'develop'
fixed bugs with site show