R1:92b72d86d75f

Merge branch 'redesign-2015' of ssh://secure.phabricator.com/diffusion/P into redesign-2015

Conflicts:
resources/celerity/map.php