Fix CS errors and test errors
Merge branch 'travis' of github.com:Danielss89/ZfcUser into travis