Add PHP 5.5 to Travis config
Merge branch '2.x' of github.com:pods-framework/pods into 2.x