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

Conflicts:
	src/main/resources/mondrian/mondrian_cube_facts.xml
Merge branch 'master' of https://github.com/openam-org-ru/ru.org.openam.auth.modules.adaptive.git