Changes after ZfcUser integration
Merge pull request #25 from TomHAnderson/zfcuser

Changes after ZfcUser integration