HTML, static asset changes
Merge remote-tracking branch 'origin/html_update' into feature/track_activation