Merge branch 'master' into auto-maintenance

diff --cc TODO.txt
index 107969d,862e2a4..3d779e3
--- 1/TODO.txt
--- 2/TODO.txt
+++ b/TODO.txt
@@@ -3,8 -3,15 +3,15 @@@
  
    FEATURES |
   ----------+
+    - PLACEMENT-NORMALIZATION
+       DONE . Normalize previous points
+       DONE . Denormalize "Info" view
+       DONE . Denormalize explained matches
+       DONE . Check placement
+       DONE . Distinguish between inherited mult and local mult
+ 
     - AUTO-MAINTENANCE
 -     . Terms Of Service acceptance
 +     DONE . Terms Of Service acceptance
         DONE . print date of hard switch
         DONE . TOS version
         DONE . user TOS acceptance (db field)