i
Merge branch 'master' of https://github.com/ptphp/Core

Conflicts:
	PtAPP/View/devinfo/index.php