(Re)added php.ini to installation
Added ImageMagick to FAQ
Merge branch 'master' into hotfix/ie