Merge branch 'develop'
highlight
Merge pull request #1 from jc1987/php-fpm

highlight
changed styling
Merge branch 'master' of https://github.com/jc1987/elasticSearchSF2 into php-fpm
Merge branch 'php-fpm' into develop