Update composer.json
fix typo
Merge branch 'master' into 2.2

* master:
  fix for backend issues
  fix typo
  Update docs for bundles site
Merge branch 'master' into 2.2
Merge branch 'master' into 2.2
composer fix
Merge branch 'master' into 2.2

* master:
:q
  no dev-master dependencies
  Fix symfony requirement
  Revert "Start of Start of going to Symfony 2.2"
  Start of Start of going to Symfony 2.2
  Updated design of viewing of formsubmissions
  Only show the formsubmissions for the selected formsubmission page
  show eye-open icon on form view actions
  Modify form controllers to show View action

Conflicts:
	composer.json
implementation of the checkbox pagepart
Merge branch 'master' into 2.2

* master:
  making form submission list PHP 5.3 compatible
  fix toString method should always return a string
  fix choice field : required
  fix typo
  fix choice field validation
  getDefaultOptions() is deprecated since version 2.1 and will be removed in 2.3. Use setDefaultOptions() instead.
  Update README.md
  Fix invalid ID names
  implementation of the checkbox pagepart

Conflicts:
	Entity/FormSubmissionFieldTypes/BooleanFormSubmissionField.php
	Form/BooleanFormSubmissionType.php
Symfony 2.2 and Kunstmaan bundles 2.2.8.* dependency
use self.version for Kunstmaan Bundles
Merge branch 'master' into symfony-2.3

* master:
  use self.version for Kunstmaan Bundles
  Symfony 2.2 and Kunstmaan bundles 2.2.8.* dependency
  implementation of the checkbox pagepart
  composer fix
  fix typo
  Update composer.json

Conflicts:
	composer.json