DATAES-128 - After release cleanups.
DATAES-128 - After release cleanups.
DATAES-94 - upgrade to latest elasticsearch 1.3.4 driver
DATAES-76 - Add support for mapping generation of inherited fields
DATAES-91 - completion suggester support
DATAES-91 - fixed tests
DATAES-133 - Updated changelog.
DATAES-134 - Updated changelog.
DATAES-134 - Prepare 1.2.0.M1 (Fowler M1).
DATAES-134 - Release version 1.2.0.M1.
DATAES-134 - Prepare next development iteration.
DATAES-134 - After release cleanups.
DATAES-91 - fixed payload feature, added corresponding unit tests to cover it, fixed code format
DATAES-130 Added support for Spel Expressions in Type

- Added support for Spel Expressions in index type

- Renamed SpELEntityTest to SpELEntityTests so they run when
called from maven
DATAES-91 - removed merge conflict file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml