Conflicts:
	build.properties

Change-Id: Ie3cf9bd0af8aba7debf4626d2db77afea37e7cb3

Merge: no
Change-Id: Ibfe17c35ec72985823389c75a5c3135998443068

Change-Id: I2ffadb382d1c8ca42f1525c24c51a441a67404f6

Added support for pointer events using the “extensible event mechanism” in GWT 2.6

Change-Id: Idac62114fe26536e62609edc944ff9dfef886e1c

Change-Id: I9c319625da3e4cfc5b49c339f54393f7e12effed

Change-Id: I73cc9c7b5509dff0cb5376af9bf4b0ef572add05

Change-Id: I1232c72c3dd8eca5d6223aa9858dac22a5f7817e

Change-Id: Ifb209889680cdfeb18eba7c836dc60e3551e5f61

Change-Id: I450d63abe4e7c4e9fd279fe3a6f6262e2945904b

Change-Id: I5103be114ed5c45a533b89b4c973bb5c91d47a8b

Change-Id: I75330f67f6a57658e95b9510502bf6a1e38924ad

72d0aa0 Update Window Javadoc based on 7.2 API review changes
ee203f5 Apply abstract ordered layout settings for replaced component (#13568)
02998d8 Updated Window API based on 7.2 API review
cd94b21 Discourage use of setNeedsLayout while a layout is running (#13542)
f374bc7 Make ComboBox always immediate (#4054)
aec102a Update 3rd party license information (#13449)
013d32d Remove old widget from tab content on replace (#12931).
3d0ff32 Prevent duplicate detach() calls with push (#13261)
a452bad Refactor VaadinPortletRequest extending. (#13551)
55dfd29 Prevent duplicate session destroy events (#12612)
2067d4e Don't allocate unnecessary memory for empty array of Objects in MethodProperty (#10446).
00a9af5 Refactor PushConfigurationTest.

Merge: no

Change-Id: I6563769a77f91a68cfeadcb3306dd71fe431863c

Change-Id: Idc78fc1bc6380d7bfada99f1efe2484b04ce3c74

* NotificationConfiguration "helpers" removed from Notification
* NotificationConfiguration methods accept Type instead of style (String)
* Tab.setIconAltText -> Tab.setIconAlternateText
* Remove the two new TabSheet.addTab() methods
* UI.reinit() -> UI.refresh()

Change-Id: I97488e7c6de8cfacc591450d69c821b2973b8707

Change-Id: Ifdc1379892d8f798f2ceabcf83d772fa6a76dd4b

51c2e93 Revert "Added ItemSetAddEvent and ItemSetRemoveEvent (#2794)"
ee4ae9f Merge from 7.1 to 7.2

Conflicts:
	scripts/automerge7.sh

Change-Id: Ieb61caed4b3b6bbc6d3dc84c02ae8eeed897a144

Change-Id: If6863d518d902ee48bb73fbb0c9b3725cb7c8707

Change-Id: Ie6fa8b51c2fd1d1fe7def9ca7c11b4023eae52b7

Change-Id: Ia4831db39528061f4ac4b98b861b8030a261cf9a

This reverts commit 85251833de.

Conflicts:
	server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
	server/tests/src/com/vaadin/data/util/TestIndexedContainer.java

Change-Id: I49dfdc58ae5841892c6d8e205c520437da9a05e5

Change-Id: I34525b7d9e78ede7f9533869326ca0c08474963a

Change-Id: I3db340a7c971be6abf18514f044114802edfc4de

Change-Id: Ic52a0be061bf22058ac9b831f3e965547a1b8933

Change-Id: Ib168ea79f80abefb140f1e64e239b5520d0fd3bd

Change-Id: I85badfcca18e129b20ab6c5c2db0b845c8c2ea5b

Conflicts:
	server/src/com/vaadin/server/communication/AtmospherePushConnection.java
	server/src/com/vaadin/server/communication/PushHandler.java

Change-Id: I93b5c3f3017aaa1ba2a231028c808d6e56fe1c11

Change-Id: Ibe169bf0ec6d2f335e099ac2659079c8fad6ac0b

Change-Id: Ic752268a9deac350dbff29ecf73cfce2eb1ba0cc

MethodProperty (#10446).

Change-Id: Ib8e2cfb42494a9dd3efb5ca62ddea9675a1dab1e

Change-Id: Iec0aecc64e16052c522eb831f13cadbd2758ae69

Change-Id: I17b963c49ba2d2de05341cf60dca0d65187314b0

The null element and the empty JSONArray are frequently created and used
as temporary objects to be encoded by the json encoder. Because they are
never manipulated it is possible to reuse the same empty element again
and save a significant amount of temp objects.
This also helps jsonEquals, which then can return faster due to:
if (fieldValue == referenceValue) return true

jsonEquals does not need to check the referenceValue for JSONobject.NULL.
The invoking code makes sure this never happens.
Boolean and Integer values are very often and much more efficiently
compared directly instead of using toString.

Change-Id: I5fd736427019406469357cda1115d2683b7a5e2b

Change-Id: Ic329b4307bcc0613e6c0160375003d4b9f7e7ee1

Change-Id: Ibe9734185af0e6ba4399b20f2f1bb55a3207abd5

Fixed the issue by replacing the legacy ContainerResizedListener
with adding (and removing) an ElementResizeListener to the
LayoutManager.

Notice also that after this change there are no longer
implementations of the deprecated ContainerResizedListener
in the framework codebase.

Change-Id: Ib984953d8b53b9535d39ae70166c17ffd5b4103b

Change-Id: I4019f3b36ec7e8234ed2c7fb330db41c7213cc84

Change-Id: Iac00191ace5d55f8b054f8b66d1802a788d368c2

This change also adds subpart support for TabSheet and
converts a test to TB3.

Change-Id: I23b6c81686ea6587470d8019e89a85149ec0b068

Contains websockets fixes for Tomcat 8 and Wildfly 8

Change-Id: I55b6576dfffd611f819a434d9b05edf1e5c6eda8

86a5f5a Selectors based on Reindeer.LAYOUT* are added for absolute layout (#11042).

Change-Id: I2d607475c63e97c312a97ddd6b41d38c66a35ec6

Change-Id: I56c8d6d34af90d0dc8ca605b62ebfe5ad95a4e5e

Change-Id: I3d12dbd4d8c1789e56cd9172f5fdd3522e89ae79

Change-Id: Ie9f4ea98a6bf4a4ec45118a46e58d15d9fe3b36f

Change-Id: I37f40eea6185b682e909da5b3f4c755b20a688e5

Change-Id: Id1f58b1ac6c207cec3357bcd96e1eb8d8de256a0

Change-Id: Iaeb6943b534e3df4dad2f8689837425cdb6a65bc

Change-Id: If6362284392d17ff18e2a907439db3339344d2b1

Change-Id: I9f48b0da3484666a73efc517651f6920301d9c04