Add TOS and Privacy Policy to 500 Error page
Fiddled with the sln because maybe that will work... grumble...
Merge branch 'anurse/1423-tosandprivacyonerrorpage' into dev
Fix build issues