Merge branch 'master' into develop
Install the XSL module for php5.
Merge branch 'PR' of https://github.com/lushc/vagrant-lamp into develop
Merge branch 'develop'