BUG Load just one of each plugin.
Merge pull request #3040 from mateusz/plugins30

BUG Load just one of each plugin.
FIX: ConfirmedPasswordField used to expose existing hash
Merge pull request #3044 from mateusz/hash

FIX: ConfirmedPasswordField used to expose existing hash
API Injector supports nesting
BUG Resolve issue with DirectorTest breaking RequestProcessor
Injector::nest and Injector::unnest are introduced to better support sandboxing of testings.
Injector and Config ::nest and ::unnest support chaining
Test cases for both Injector::nest and Config::nest
BUG HTMLText whitelist considers text nodes
Minor improvement to #2853.
If a list of whitelisted elements are specified, text nodes no longer evade the whitelist
Fix 'Uncaught ReferenceError: jQuery is not defined' if jQuery is not included in template.
Allow PHPUnit installations with composer
Instruct travis to use composer version of phpunit
Merge pull request #3079 from timsnadden/3.1

Fix 'Uncaught ReferenceError: jQuery is not defined'
Don't add the class manifest with tests as an exclusive manifest
Merge pull request #3096 from simonwelsh/nonexclusive-test

Don't add the class manifest with tests as an exclusive manifest
Merge pull request #3087 from tractorcow/pulls/3.0-phpunit

BUG Allow PHPUnit installation with composer / Fix travis
Merge pull request #3021 from tractorcow/pulls/3.1-htmltext-whitelist

BUG HTMLText whitelist considers text nodes
Path resolution cleanup
[ref: CWPBUG-158]
MINOR LeftAndMain::getRecord check $ClassName before use

While the check for `$classname` was done in the first conditional, it was left out of the other two, leading to potential issues when an invalid ID was given, instead of the expected `false`.
Merge pull request #3102 from ss23/patch-3

MINOR LeftAndMain::getRecord check $ClassName before use
MINOR Use composer @stable for PHPUnit

Using stable will allow some packages to be downloaded as zips instead of clones all the time.
Merge remote-tracking branch 'origin/3.0' into 3.1

Conflicts:
	.travis.yml
	forms/ConfirmedPasswordField.php
Merge pull request #3058 from tractorcow/pulls/injector-stack-tests

API Injector supports nesting
Merge pull request #3085 from tractorcow/pulls/3.1-path-checking

Path resolution cleanup