updates
update
Merge branch 'php' of https://github.com/vcometa/wlabs into php

Conflicts:
	index.php