-
Merge branch 'master' of
https://github.com/openam-org-ru/ru.org.openam.auth.modules.adaptive.git

Conflicts:
	src/test/java/ru/org/openam/auth/modules/adaptive/TransferTest.java