Fix merge issues regarding web front

Fix merge issues regarding the unit tests

Fix merge issues

(0) -100 -30 -10 -3 tip

mercurial