move to php cli library
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	index.php
move to php cli library merge fix