test commit
Merge branch 'master' of https://github.com/gigsth/gisiph

Conflicts:
	dist/php/_test.php