some changes for java 1.6 compability
Merge branch 'master' of https://github.com/enwida/idpRepo