merge to trunk all changes from 36817 until 37378 under the packages: polymer,

pkg/polymer/lib/src/js/polymer/polymer.html

Index: pkg/polymer/lib/src/js/polymer/polymer.html
===================================================================
--- pkg/polymer/lib/src/js/polymer/polymer.html	(revision 37373)
+++ pkg/polymer/lib/src/js/polymer/polymer.html	(working copy)
@@ -1,8 +1,12 @@
 <!--
- Copyright 2013 The Polymer Authors. All rights reserved.
- Use of this source code is governed by a BSD-style
- license that can be found in the LICENSE file.
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
+
+<link rel="import" href="layout.html">
+
 <script src="polymer.js"></script>
-<!-- <link rel="import" href="../polymer-dev/polymer.html"> -->
-<link rel="import" href="polymer-body.html">