Update php54 phalcon 1.2.5 (+2 squashed commits)
Squashed commits:
[31ecec4] Update php53 phalcon 1.2.5
[38cd808] Update phalcon to 1.2.5