Merge branch 'redesign-2015' of ssh://secure.phabricator.com/diffusion/P into redesign-2015
Conflicts: resources/celerity/map.php