merge
Merge branch 'master' of https://github.com/cardteam/card

Conflicts:
	posp-web/src/test/resources/data/common-security-data.xml