Merge branch 'hotfix/0.14.2'
resolve merge conflicts for 0.15.0
Upgrade to use latest PhpLibrary component
Merge branch 'master' into develop

Conflicts:
	build.properties