changed routing from urls to javascript to prevent users from having a link to the warning page
Merge branch 'master' into gh-pages