Merge branches 'develop' and 'master' of https://github.com/phpXFace/frontcontroller