Modifying tests. New PHP libraries.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/sandcamp-demo.iml
	.idea/workspace.xml