Fixes on the client
Merge branch 'master' of github.com:christophervalles/ZF2-Book-Code