Put it all in there and fixed the tests
Merge branch 'master' of github.com:AmazingDreams/phalcon-auth