Merge branch 'master' into blender-tweaks

Conflicts:
	resources/celerity/map.php
	src/applications/home/controller/PhabricatorHomeMainController.php
	src/applications/maniphest/controller/ManiphestTaskEditController.php
	src/applications/maniphest/query/ManiphestTaskQuery.php
	src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php

src/applications/differential/controller/DifferentialDiffCreateController.php

@@ -20,8 +20,8 @@ final class DifferentialDiffCreateController extends DifferentialController {
 
       if (!strlen($diff)) {
         $errors[] = pht(
-          "You can not create an empty diff. Copy/paste a diff, or upload a ".
-          "diff file.");
+          'You can not create an empty diff. Copy/paste a diff, or upload a '.
+          'diff file.');
         $e_diff = pht('Required');
         $e_file = pht('Required');
       }
@@ -87,7 +87,7 @@ final class DifferentialDiffCreateController extends DifferentialController {
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($cancel_uri)
-          ->setValue(pht("Create Diff")));
+          ->setValue(pht('Create Diff')));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Create New Diff'))
@@ -104,7 +104,6 @@ final class DifferentialDiffCreateController extends DifferentialController {
       ),
       array(
         'title' => pht('Create Diff'),
-        'device' => true,
       ));
   }