Disable php 5.5 in travis-ci
Merge branch 'master' into seperate-docroot