removed deltaspike fork
Merge branch 'master' of github.com:picketlink/picketlink

Conflicts:
	core/impl/src/main/java/org/picketlink/internal/DefaultIdentity.java