Version 2
Merge branch 'master' of https://github.com/NacheeN/PHP

Conflicts:
	protected/runtime/application.log