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

* master:
  change imagepagepart to use media.url instead of show
  Use URL method for media in downloadpagepart view
Add translations
Merge branch 'master' into 2.2

* master:
  change dev-master dependency to * for pagepart
  Start of going to Symfony 2.2

Conflicts:
	composer.json
Merge branch 'master' into 2.2

* master:
  Update README.md
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
  Add translations
  composer fix
  Update composer.json
  Update composer.json

Conflicts:
	composer.json