some requires and fixes.

some requires and fixes.
Merge branch 'master' of https://github.com/NachoTsvetkov/PHP-Sofuni-Teamwork