merge stage
merge stage
Merge branch 'stage'
added google analytics
fix admin
fix dev
fix dev