updated local.php and global.php
Merge branch 'master' of https://github.com/ali-dev/zf2test