minor
Merge branch 'master' of github.com:picketlink/picketlink

Conflicts:
	docs/src/main/docbook/en-US/picketlink-idm.xml