Merge branch 'master' of https://github.com/seriousteam/azphplib.git

Conflicts:
	README.md
merge