typo fix
Merge branch 'master' into current
nginx url rewrite for phalcon