Loads analytics via main.js instead of ui.js
Merge pull request #53 from mmmavis/bug1045003

Bug1045003
Bug 1043540 - Create a 404 page for the Maker Party site
Merge branch 'mmmavis-bug-1043540-404-page' into develop
2.1.7
Merge branch 'develop'