Utimos Cambios Gonzalo
Merge branch 'master' of https://github.com/NacheeN/PHP

Conflicts:
	protected/runtime/application.log
Revert "Merge branch 'master' of https://github.com/NacheeN/PHP"

This reverts commit 5dda873d27b8f020a80ee9f20acd6698d4b67409.