Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	resources/celerity/map.php
	src/__phutil_library_map__.php
	src/applications/differential/storage/DifferentialReviewer.php
	src/applications/home/controller/PhabricatorHomeMainController.php
	src/applications/people/controller/PhabricatorPeopleProfileController.php

Author: xiaogaozi

.arclint

@@ -1,7 +1,8 @@
 {
   "exclude": [
     "(^externals/)",
-    "(\\.lint-test$)"
+    "(^webroot/rsrc/externals/)",
+    "(/__tests__/data/)"
   ],
   "linters": {
     "chmod": {
@@ -10,43 +11,50 @@
     "filename": {
       "type": "filename"
     },
+    "generated": {
+      "type": "generated"
+    },
     "javelin": {
       "type": "javelin",
       "include": "(\\.js$)",
       "exclude": [
-        "(^externals/JsShrink/)",
-        "(^support/aphlict/)",
-        "(^webroot/rsrc/externals/raphael/)"
+        "(^support/aphlict/)"
       ]
     },
     "jshint": {
       "type": "jshint",
       "include": "(\\.js$)",
-      "exclude": [
-        "(^externals/JsShrink/)",
-        "(^webroot/rsrc/externals/raphael/)"
-      ],
-      "flags": ["--config=support/jshint/jshintconfig"]
+      "jshint.jshintrc": "support/jshint/jshintconfig"
     },
-    "generated": {
-      "type": "generated"
+    "json": {
+      "type": "json",
+      "include": [
+        "(^src/docs/book/.*\\.book$)",
+        "(^support/jshint/jshintconfig$)",
+        "(^\\.arcconfig$)",
+        "(^\\.arclint$)",
+        "(\\.json$)"
+      ]
     },
     "merge-conflict": {
       "type": "merge-conflict"
     },
     "nolint": {
       "type": "nolint"
     },
+    "phutil-library": {
+      "type": "phutil-library",
+      "include": "(\\.php$)"
+    },
     "phutil-xhpast": {
       "type": "phutil-xhpast",
       "include": "(\\.php$)",
       "phutil-xhpast.deprecated.functions": {
         "phutil_escape_html": "The phutil_escape_html() function is deprecated. Raw strings passed to phutil_tag() or hsprintf() are escaped automatically."
       }
     },
-    "phutil-library": {
-      "type": "phutil-library",
-      "include": "(\\.php$)"
+    "spelling": {
+      "type": "spelling"
     },
     "text": {
       "type": "text",
@@ -63,20 +71,16 @@
         "(^\\.arclint)"
       ]
     },
-    "spelling": {
-      "type": "spelling"
-    },
     "xhpast": {
       "type": "xhpast",
       "include": "(\\.php$)",
       "severity": {
         "16": "advice",
-        "29": "warning",
-        "31": "error",
-        "34": "error",
-        "35": "error"
+        "34": "error"
       },
-      "xhpast.naminghook": "PhabricatorSymbolNameLinter"
+      "xhpast.naminghook": "PhabricatorSymbolNameLinter",
+      "xhpast.php-version": "5.2.3",
+      "xhpast.php-version.windows": "5.3.0"
     }
   }
 }

.gitignore

@@ -1,25 +1,9 @@
-.DS_Store
-._*
-.#*
-*#
-*~
-*.swp
-.*.un~
-*.orig
-tags
-
-# NetBeans project files
-/nbproject/
-
-# PhpStorm project files
-.idea/
-
-# Arcanist scratch directory
-/.arc
+# NOTE: Thinking about adding files created by your operating system, IDE,
+# or text editor here? Don't! Add them to your per-user .gitignore instead.
 
 # Diviner
 /docs/
-/.divinercache
+/.divinercache/
 
 # libphutil
 /src/.phutil_module_cache

NOTICE

@@ -1,7 +1,21 @@
 Phabricator
-Copyright 2013 Facebook, Inc.
+Copyright 2014 Phacility, Inc.
 
-This product includes software developed at
-Facebook, Inc. (http://www.facebook.com/facebook).
+This software is primarily developed and maintained by Phacility, Inc.
 
-Libraries in externals/ have their own licenses and copyright holders.
+  http://www.phacility.com/
+
+Portions of this software were developed by various contributors, who retain
+copyright on their work. These works are licensed to Phacility, Inc.
+
+Phabricator is available under the Apache 2.0 license. See LICENSE for more
+information.
+
+Phabricator and Phacility are trademarks of Phacility, Inc. For additional
+information about trademarks that pertain to this software, see:
+
+  http://www.phacility.com/trademarks/
+
+This software uses other open source libraries, which are located in
+"externals/" and "webroot/rsrc/externals/". These libraries have their own
+licenses and copyright holders.