Application + public
Merge branch 'master' of https://github.com/Darkvador-a/ZF1