added deployment branch from svn working copy
Merge branch 'master' into deployment
Merge branch '2147' into deployment

Conflicts:
	tests/class.PageZone_testcase.php
	tests/class.fixture.php
	tests/class.tx_newspaper_database_testcase.php

also merged 2034 from master
also merged 2125 from master
Merge branch '1922' into deployment

Conflicts:
	tests/class.PageZone_testcase.php
	tests/class.fixture.php
	tests/class.tx_newspaper_database_testcase.php
Merge remote-tracking branch 'origin/deployment' into deployment

Conflicts:
	tests/class.PageZone_testcase.php
	tests/class.fixture.php
	tests/class.tx_newspaper_database_testcase.php
Manually resolved a git problem (#1922)
Merge branch '2149'
USer TSConfnig newspaper.placementModule.showDropdownInheritFrom = [0|1] (#2149)