Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'master' into gh-pages
Forcing image to be present - needs to be a build process
Updating layout for firefox and updating to latest component versions
Merge branch 'gh-pages'