Merge branch 'v1'
dev analytics and xml
fixed deploy stuff
Merge branch 'master' into v1