Merge branch 'gh-pages'
Merge remote-tracking branch 'origin/gh-pages'
change order
fix user creation
change analytic id
Merge remote-tracking branch 'origin/gh-pages'