merge 1.32 and undo all non-mainline changes
Merge branch 'master' of github.com:Alderian33/webDiplomacy