Move to php54
support php webserver
support php webserver
support php webserver
support php webserver
Merge branch 'travis' into f/php54

Conflicts:
	.travis.yml