GEM:16 changed the stuff as needed
GEM:16 fixed the analytics stuff
Merge branch 'web/bugs/host39/16' into dev