bumped php version to 5.4.15
bumped nginx version to 1.4.1
merged changes from master