Fix a fatal error in some PHP versions.
Merge pull request #2184 from jakzal/bugfix/orm-indexer-fatal-error

Fix a fatal error in some PHP versions.
fixed Access level error in AddressController.
[ApiBundle] A client creation command has been added.
Merge pull request #2180 from aRn0D/api

[ApiBundle] A client creation command has been added.
Merge pull request #2185 from aitboudad/patch-1

fixed Access level error in AddressController.
[ResourceBundle] The collection form type has been improved
[WebBundle] Fix invalid html markup for payments forms

Added easier way to change states & hide editing for non super admins
Updated to describe defaulting to property name behaviour

Updated the spec for the Twig extension, so it describes the behaviour that happens when rendering a sorting link with no field name.
I've also renamed the "it_should_not_render_sorting_link" to "it_should_not_render_sorting_link_when_not_sortable" so it's more consistent with the new scenario name, and also a little more explicit about what it does.
Fixed renderSortingLink not defaulting to property

Fixed renderSortingLink not defaulting to using the property name when sortable is set to false.
Merge pull request #2202 from LewisW/master

[ResourceBundle] Fixed renderSortingLink not defaulting to property name
[AttributeBundle] Fix key names for validation_groups config
Merge pull request #2203 from adamelso/attribute-validation-groups-config

[AttributeBundle] Fix key names for validation_groups config
Merge pull request #2197 from aRn0D/form-collection

[ResourceBundle] The collection form type has been improved
[CoreBundle] Fix version constraint on jms/serializer-bundle
Merge pull request #2208 from adamelso/core-bundle-jms-serializer-version

[CoreBundle] Fix version constraint on jms/serializer-bundle
Adding elasticsearch to Vagrant box
Update bootstrap.sh
Merge pull request #2209 from antonioperic/master

Adding elasticsearch to Vagrant box
Added Volume based shipping calculator